[h5utils] 05/39: Imported Upstream version 1.10
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Jul 21 23:56:06 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository h5utils.
commit 98e9df1901a05a55cf37103d7ed8292901567f47
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Jul 21 23:12:21 2015 +0200
Imported Upstream version 1.10
---
COPYING | 3 +-
ChangeLog | 460 +-------------------------------------
INSTALL | 61 ++---
Makefile.am | 7 +-
Makefile.in | 120 +++++-----
NEWS | 8 +
aclocal.m4 | 567 ++++++++++++++++++++---------------------------
arrayh4.c | 2 +-
arrayh5.c | 2 +-
colormaps/autumn | 16 +-
colormaps/cool | 16 +-
colormaps/dkbluered | 33 +++
colormaps/winter | 16 +-
compile | 90 ++++----
configure | 161 +++++++++-----
configure.ac | 35 +--
copyright.h | 2 +-
depcomp | 65 +++---
h5fromh4.c => h4fromh5.c | 119 +++++-----
h5fromh4.1 | 4 +-
h5fromh4.c | 2 +-
h5fromitxt.c | 2 +-
h5fromtxt.1 | 4 +-
h5fromtxt.c | 2 +-
h5math.1 | 6 +-
h5math.c | 2 +-
h5topng.c | 2 +-
h5totxt.1 | 4 +-
h5totxt.c | 2 +-
h5tov5d.1 | 4 +-
h5tov5d.c | 4 +-
h5tovtk.1 | 2 +-
h5tovtk.c | 2 +-
h5utils.c | 2 +-
install-sh | 102 +++++----
missing | 85 ++++---
mkinstalldirs | 150 -------------
writepng.c | 2 +-
38 files changed, 767 insertions(+), 1399 deletions(-)
diff --git a/COPYING b/COPYING
index 0b4a32e..3f92c25 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,8 @@
#############################################################################
The h5utils package is
- Copyright (c) 1999, 2000, 2001, 2002 by the Massachusetts Institute of Technology
+ Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ by the Massachusetts Institute of Technology
#############################################################################
The following license applies to all files in the
diff --git a/ChangeLog b/ChangeLog
index 56a4ed1..25d09e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,459 +1 @@
-2004-08-05 Steven G. Johnson <stevenj at ab-initio>
-
- * NEWS, configure.ac: version bump
-
-2004-08-03 Steven G. Johnson <stevenj at ab-initio>
-
- * h5topng.c: don't mix declarations with code (thanks to Maarten
- van Reeuwijk for the bug report)
-
-2004-07-13 Steven G. Johnson <stevenj at ab-initio>
-
- * NEWS: updated NEWS for 1.9
-
- * configure.ac, h5math.c: update for latest libmatheval
-
-2004-06-05 Steven G. Johnson <stevenj at ab-initio>
-
- * arrayh5.c, arrayh5.h, h5topng.1.in, h5topng.c, writepng.c,
- writepng.h: support Matlab-like notation for slices, tiling
- overlay/contour to cover data
-
-2004-05-24 Steven G. Johnson <stevenj at ab-initio>
-
- * NEWS, configure.ac: version bump
-
- * h5math.1, h5math.c: added h5math man page etc.
-
- * h5tov5d.1: whoops
-
- * h5math.c: wrapping
-
- * h5fromh4.1, h5fromtxt.1, h5topng.1.in, h5totxt.1, h5tov5d.1,
- h5tovtk.1: fixed copyright dates in man pages
-
- * h5math.c: whoops
-
- * h5math.c: make "t" variable the same as the last dimension,
- consistent with slice convention
-
- * Makefile.am, configure.ac, h5math.c: added h5math utility (still
- needs man page)
-
- * h5fromh4.c, h5fromitxt.c, h5fromtxt.c, h5topng.c, h5totxt.c,
- h5tov5d.c, h5tovtk.c, h5utils.c, h5utils.h: use my_strdup
- everywhere, get rid of some compiler warnings
-
-2004-05-22 Steven G. Johnson <stevenj at ab-initio>
-
- * Makefile.am: vpath build
-
- * h5topng.1.in: fixed some formatting problems
-
- * Makefile.am: make sure EXTRA_MANS is distributed
-
- * NEWS: planned release date
-
- * h5tovtk.c: whoops, missing '0'
-
- * NEWS: note more digits
-
- * arrayh5.c, h5totxt.c: whoops, screwed up slices
-
- * NEWS: don't know release date yet
-
- * NEWS, configure.ac: new version
-
- * mkdist.sh: mkdist script
-
- * ChangeLog: generate automatically
-
- * Makefile.am: add latest colormaps
-
- * h5topng.c: check for -8 with -A
-
- * h5topng.1.in, h5topng.c, writepng.c, writepng.h: default to
- 24-bit output, -8 for old behavior
-
-2004-05-21 Steven G. Johnson <stevenj at ab-initio>
-
- * h5topng.1.in, h5totxt.1, h5tov5d.1, h5tovtk.1: updated man pages
-
- * arrayh4.c, arrayh5.c, colormaps/bluered, colormaps/gray,
- colormaps/green, colormaps/yarg, colormaps/yellow, copyright.h,
- h5fromh4.c, h5fromitxt.c, h5fromtxt.c, h5topng.c, h5totxt.c,
- h5tov5d.c, h5tovtk.c, h5utils.c, writepng.c, writepng.h: added
- translucent overlay option
-
- * h5topng.c: make nx = cols by default in h5topng
-
- * INSTALL: INSTALL is supplied by automake --add-missing
-
- * INSTALL, Makefile.am, arrayh5.c, arrayh5.h, configure.ac,
- h5fromitxt.c, h5read.cc, h5topng.c, h5totxt.c, h5tov5d.c,
- h5tovtk.c, install-sh: support multiple slice dimensions
-
-2004-03-02 Steven G. Johnson <stevenj at ab-initio>
-
- * Makefile.am, h5fromitxt.c: added h5fromitxt
-
-2002-07-15 Steven G. Johnson <stevenj at ab-initio>
-
- * NEWS, configure.in: bumped version
-
- * h5read.cc: C++ fix for g++ 3.x, from Josselin Mouette
-
-2002-06-14 Steven G. Johnson <stevenj at ab-initio>
-
- * writepng.c: follow gd lib in initializing alpha before palette
- (don't know if it matters)
-
- * h5topng.c: don't use colormap dir for ./<colormap> or
- /<colormap>
-
-2002-05-30 Steven G. Johnson <stevenj at ab-initio>
-
- * h5totxt.1, h5totxt.c: added -a and -. flags
-
-2002-03-16 Steven G. Johnson <stevenj at ab-initio>
-
- * NEWS: added 1.7.1 notes
-
- * Makefile.in: export branch for make dist
-
- * NEWS, configure.in: bumped version
-
- * ChangeLog: updated
-
- * README: added URL
-
- * writepng.c: fixed array overrun causing floating-point
- exceptions on Alpha (thanks to Marin Soljacic for the bug report)
-
- * Makefile.am, configure.ac: fixed h5fromh4 and make dist
-
- * writepng.c: fixed array overrun causing floating-point
- exceptions on Alpha (thanks to Marin Soljacic for the bug report)
-
-2002-03-14 Steven G. Johnson <stevenj at ab-initio>
-
- * Makefile.am, Makefile.in, configure.ac, configure.in,
- h5fromh4.c, h5fromtxt.c, h5topng.c, h5totxt.c, h5tov5d.c,
- h5tovtk.c: use automake
-
-2002-03-13 Steven G. Johnson <stevenj at ab-initio>
-
- * Makefile.in: use mandir
-
-2002-03-11 Steven G. Johnson <stevenj at ab-initio>
-
- * README: added URL
-
-2002-03-09 Steven G. Johnson <stevenj at ab-initio>
-
- * h5topng.c: print warning for -c <h5file>
-
- * Makefile.in: whoops
-
- * h5fromh4.1, h5fromtxt.1, h5totxt.1, h5tov5d.1, NEWS,
- h5topng.1.in, h5tovtk.1: updated dates
-
- * INSTALL, README, README-h5utils.html: made more GNU-ly correct
-
- * AUTHORS: added AUTHORS file to be GNU-ly correct
-
-2002-03-05 Steven G. Johnson <stevenj at ab-initio>
-
- * Makefile.in, h5fromh4.c, h5fromtxt.c, h5topng.c, h5totxt.c,
- h5tov5d.c, h5tovtk.c, h5utils.c, h5utils.h: eliminated code
- duplication
-
- * NEWS, writepng.c: finally fixed garbage pixels bug in h5topng
-
- * NEWS, arrayh5.c, arrayh5.h, h5read.cc, h5topng.1.in, h5topng.c,
- h5totxt.1, h5totxt.c, h5tov5d.c, h5tovtk.c: added -0 option
-
- * NEWS, h5topng.1.in, h5topng.c: added -R option
-
- * colormaps/autumn, colormaps/bluered, colormaps/bone,
- colormaps/colorcube, colormaps/cool, colormaps/copper,
- colormaps/flag, colormaps/gray, colormaps/hot, colormaps/hsv,
- colormaps/jet, colormaps/lines, colormaps/pink, colormaps/prism,
- colormaps/spring, colormaps/summer, colormaps/vga,
- colormaps/winter, h5topng.1.in, h5topng.c, writepng.c, writepng.h:
- added alpha channel support to color maps
-
- * h5topng.c: better error message for -c (catches common mistake)
-
- * h5topng.1.in: slight improvements
-
- * h5topng.c: have built-in gray colormap fallback
-
-2002-03-04 Steven G. Johnson <stevenj at ab-initio>
-
- * h5topng.1.in: minor improvements; noted hsv
-
- * h5topng.1.in: linewrapped
-
- * h5topng.1: whoops
-
- * h5topng.1: linewrapped
-
- * NEWS: updated for 1.7
-
- * ChangeLog: added
-
- * COPYING, README-h5utils.html, arrayh4.c, arrayh4.h, arrayh5.c,
- arrayh5.h, copyright.h, h5fromh4.1, h5fromh4.c, h5fromtxt.1,
- h5fromtxt.c, h5read.cc, h5topng.1.in, h5topng.c, h5totxt.1,
- h5totxt.c, h5tov5d.1, h5tov5d.c, writepng.c, writepng.h: 2002
- copyright year update
-
- * h5tovtk.1, h5tovtk.c: fixed h5tovtk man page
-
-2002-03-01 Steven G. Johnson <stevenj at ab-initio>
-
- * h5topng.c: noted location of colormap files
-
- * Makefile.in, configure.in, h5topng.1, h5topng.1.in, h5topng.c,
- writepng.c, writepng.h: added variable colormap support
-
- * h5read.cc: synced with latest arrayh5
-
- * colormaps/autumn, colormaps/bluered, colormaps/bone,
- colormaps/colorcube, colormaps/cool, colormaps/copper,
- colormaps/flag, colormaps/gray, colormaps/hot, colormaps/hsv,
- colormaps/jet, colormaps/lines, colormaps/pink, colormaps/prism,
- colormaps/spring, colormaps/summer, colormaps/vga,
- colormaps/winter: added some color map files
-
-2002-01-05 Steven G. Johnson <stevenj at ab-initio>
-
- * Makefile.in, arrayh5.c, arrayh5.h, configure.in, h5topng.c,
- h5totxt.c, h5tov5d.c, h5tovtk.1, h5tovtk.c: added preliminary
- h5tovtk
-
-2001-10-16 Steven G. Johnson <stevenj at ab-initio>
-
- * Makefile.in: Use CPPFLAGS and LDFLAGS when calling mkoctfile!
- Thanks to Max Colice for the bug report.
-
-2001-10-02 Steven G. Johnson <stevenj at ab-initio>
-
- * h5tov5d.c: whoops, fixed datatype in -T mode
-
-2001-09-22 Steven G. Johnson <stevenj at ab-initio>
-
- * h5tov5d.c: slight bug fix in -T (?)
-
- * NEWS, h5tov5d.1, h5tov5d.c: added -T option to h5tov5d
-
-2001-03-18 Steven G. Johnson <stevenj at ab-initio>
-
- * Makefile.in: whoops, fixed problem when --without-h5tov5d and
- --without-h5fromh4 are used. Thanks to Nikola Ivanov Nikolov for
- the fix.
-
-2001-02-14 Steven G. Johnson <stevenj at ab-initio>
-
- * h5fromtxt.1: minor fix
-
-2001-01-17 Steven G. Johnson <stevenj at ab-initio>
-
- * COPYING, NEWS, README-h5utils.html, arrayh4.c, arrayh4.h,
- arrayh5.c, arrayh5.h, configure.in, copyright.h, h5fromh4.1,
- h5fromh4.c, h5fromtxt.1, h5fromtxt.c, h5read.cc, h5topng.1,
- h5topng.c, h5totxt.1, h5totxt.c, h5tov5d.1, h5tov5d.c, writepng.c,
- writepng.h: Don't build h5fromh4 if h4toh5 is present. Bumped
- version and copyright year.
-
-2000-12-09 Steven G. Johnson <stevenj at ab-initio>
-
- * Makefile.in: 'make dist' should call autoheader
-
- * NEWS, configure.in: bumped version number
-
- * Makefile.in, arrayh4.h, config.h.in, configure.in, h5tov5d.c:
- Support disabling Octave plugin manually, in case of C++
- craziness. Support Vis5d+ header file locations. Support Debian
- HDF header file locations. Use autoheader.
-
-2000-07-28 Steven G. Johnson <stevenj at ab-initio>
-
- * writepng.c: fixed bug in contour plotting
-
-2000-07-10 Steven G. Johnson <stevenj at ab-initio>
-
- * NEWS: updated
-
-2000-07-09 Steven G. Johnson <stevenj at ab-initio>
-
- * README-h5utils.html: Note that HDF4 libraries are required for
- h5fromh4.
-
- * README-h5utils.html: documented h5fromh4
-
-2000-05-30 Steven G. Johnson <stevenj at ab-initio>
-
- * NEWS, h5topng.1, h5topng.c: Added -S <s> option to h5topng as a
- shortcut for -X <s> -Y <s>.
-
-2000-05-29 Steven G. Johnson <stevenj at ab-initio>
-
- * NEWS, configure.in: bumped version
-
- * h5fromh4.1: slight fixes
-
- * h5fromh4.1: added h5fromh4 man page
-
- * Makefile.in, arrayh4.c, arrayh4.h, configure.in, h5fromh4.c:
- added h5fromh4
-
- * h5fromtxt.c: got rid of spurious "sep" variable
-
-2000-05-28 Steven G. Johnson <stevenj at ab-initio>
-
- * h5fromtxt.c, h5topng.c, h5totxt.c, h5tov5d.c, Makefile.in, NEWS,
- README-h5utils.html, arrayh5.c, arrayh5.h, configure.in,
- h5fromtxt.1: added h5fromtxt
-
-2000-02-01 Steven G. Johnson <stevenj at ab-initio>
-
- * h5topng.1: slight correction
-
- * h5topng.c: fix so it works without -C!
-
- * NEWS, configure.in: bumped version
-
- * h5topng.c, writepng.c, writepng.h, h5topng.1: improved crude
- contour feature
-
- * h5topng.1: Fixed display bug; thanks to Christoph Becher for the
- correction.
-
-2000-01-30 Steven G. Johnson <stevenj at ab-initio>
-
- * NEWS: credited 1.3.3 bug report
-
- * configure.in: bumped version
-
- * NEWS, arrayh5.c: got rid of compiler warning
-
- * writepng.c: bug fix (uninitialized var)
-
-2000-01-29 Steven G. Johnson <stevenj at ab-initio>
-
- * NEWS, h5topng.1, h5topng.c: added -Z option
-
-2000-01-28 Steven G. Johnson <stevenj at ab-initio>
-
- * h5topng.c: fixed typo
-
- * configure.in, h5topng.1, h5topng.c, NEWS: now support h5topng -C
- filename:dataset
-
- * NEWS, configure.in: bumped version
-
- * h5tov5d.c: fixed bug in joining hdf5 files
-
-2000-01-27 Steven G. Johnson <stevenj at ab-initio>
-
- * h5topng.c, h5totxt.c: fixed handling of -d option so that it
- doesn't get overriden if only a single file specifies a dataset
- via fname:dataset.
-
-2000-01-21 Steven G. Johnson <stevenj at ab-initio>
-
- * README-h5utils.html, NEWS: documented changes
-
- * configure.in, h5tov5d.c, Makefile.in, config.h.in: detect -lv5d
- library
-
- * h5totxt.1, h5totxt.c, h5tov5d.1, h5tov5d.c, arrayh5.c,
- arrayh5.h, configure.in, h5topng.1, h5topng.c: added
- filename:dataset syntax
-
- * NEWS, configure.in: bumped version
-
- * h5totxt.c: fixed help message
-
-2000-01-13 Steven G. Johnson <stevenj at ab-initio>
-
- * Makefile.in, NEWS, configure.in: use CPPFLAGS when compiling
-
-2000-01-01 Steven G. Johnson <stevenj at ab-initio>
-
- * h5topng.1, h5topng.c, h5totxt.1, h5totxt.c, h5tov5d.1,
- h5tov5d.c, writepng.c, writepng.h, COPYING, NEWS,
- README-h5utils.html, arrayh5.c, arrayh5.h, configure.in,
- copyright.h, h5read.cc: h5tov5d -o now joins; bumped copyright
- year
-
- * NEWS: noted changes
-
- * configure.in: bumped version
-
- * README-h5utils.html: noted man page
-
- * README-h5utils.html: updated license
-
- * h5topng.c, h5totxt.c, h5tov5d.1, h5tov5d.c, Makefile.in,
- README-h5utils.html, configure.in, copyright.h, COPYING: added
- h5tov5d
-
-1999-12-31 Steven G. Johnson <stevenj at ab-initio>
-
- * configure.in: some cleanup
-
- * README-h5utils.html: Better documentation of (revised)
- installation.
-
- * Makefile.in, configure.in: install h5read.oct in right place
-
- * Makefile.in: fixed install/uninstall rules so that they ignore
- things that aren't built
-
-1999-12-06 Steven G. Johnson <stevenj at ab-initio>
-
- * README-h5utils.html: small fixes
-
- * configure.in, h5totxt.1, h5totxt.c, Makefile.in, NEWS,
- README-h5utils.html: added h5totxt
-
-1999-11-22 Steven G. Johnson <stevenj at ab-initio>
-
- * Makefile.in: don't strip (-s) man page!!
-
- * README, README-h5utils.html: changed README to HTML
-
- * Makefile.in, README, h5topng.1: added man page
-
- * .png: got rid of garbage file
-
- * Makefile.in: made sure 'make clean' gets rid of h5read.o
-
- * configure.in, h5topng.c, config.h.in: various fixes
-
- * COPYING: comment-ized license
-
- * writepng.c, writepng.h, arrayh5.h, h5read.cc, h5topng.c,
- arrayh5.c: added copyright notices
-
- * Makefile.in: fixed clean targets
-
- * COPYING: added MIT license
-
- * configure.in, install-sh, Makefile, Makefile.in, config.h.in:
- autoconfiscated
-
- * README.writepng, .indent.pro: deleted extraneous files
-
- * README: added README
-
- * .indent.pro, .png, Makefile, README.writepng, arrayh5.c,
- arrayh5.h, h5read.cc, h5topng.c, writepng.c, writepng.h: New file.
-
- * .indent.pro, .png, Makefile, README.writepng, arrayh5.c,
- arrayh5.h, h5read.cc, h5topng.c, writepng.c, writepng.h: created
- h5utils repository
-
+Generated by mkdist.sh
diff --git a/INSTALL b/INSTALL
index 54caf7c..56b077d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,13 +1,16 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
-Foundation, Inc.
+Installation Instructions
+*************************
- This file is free documentation; the Free Software Foundation gives
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
- These are generic installation instructions.
+These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -67,9 +70,9 @@ The simplest way to compile this package is:
Compilers and Options
=====================
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
-for details on some of the pertinent environment variables.
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
@@ -82,7 +85,7 @@ is an example:
Compiling For Multiple Architectures
====================================
- You can compile the package for more than one kind of computer at the
+You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
@@ -99,19 +102,19 @@ for another architecture.
Installation Names
==================
- By default, `make install' will install the package's files in
+By default, `make install' will install the package's files in
`/usr/local/bin', `/usr/local/man', etc. You can specify an
installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PATH'.
+option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
+give `configure' the option `--exec-prefix=PREFIX', the package will
+use PREFIX as the prefix for installing programs and libraries.
Documentation and other data files will still use the regular prefix.
In addition, if you use an unusual directory layout you can give
-options like `--bindir=PATH' to specify different values for particular
+options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
@@ -122,7 +125,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
- Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -137,11 +140,11 @@ you can use the `configure' options `--x-includes=DIR' and
Specifying the System Type
==========================
- There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -167,9 +170,9 @@ eventually be run) with `--host=TYPE'.
Sharing Defaults
================
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -178,7 +181,7 @@ A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
- Variables not defined in a site shell script can be set in the
+Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -186,14 +189,18 @@ them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script). Here is a another example:
+
+ /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
`configure' Invocation
======================
- `configure' recognizes the following options to control how it
-operates.
+`configure' recognizes the following options to control how it operates.
`--help'
`-h'
diff --git a/Makefile.am b/Makefile.am
index 1fd52db..59c784a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,14 +3,14 @@ colormaps/colorcube colormaps/cool colormaps/copper colormaps/flag \
colormaps/gray colormaps/green colormaps/hot colormaps/hsv \
colormaps/jet colormaps/lines colormaps/pink colormaps/prism \
colormaps/spring colormaps/summer colormaps/vga colormaps/winter \
-colormaps/yarg colormaps/yellow
+colormaps/yarg colormaps/yellow colormaps/dkbluered
EXTRA_MANS = h5topng.1.in h5tov5d.1 h5fromh4.1 h5math.1
EXTRA_DIST = h5read.cc copyright.h $(COLORMAPS) $(EXTRA_MANS)
noinst_PROGRAMS = h5fromitxt # quick hack, not really supported
bin_PROGRAMS = h5totxt h5fromtxt h5tovtk @MORE_H5UTILS@
-EXTRA_PROGRAMS = h5topng h5tov5d h5fromh4 h5math
+EXTRA_PROGRAMS = h5topng h5tov5d h5fromh4 h4fromh5 h5math
dist_man_MANS = h5totxt.1 h5fromtxt.1 h5tovtk.1 @MORE_H5UTILS_MANS@
nodist_man_MANS = @H5TOPNG_MAN@
@@ -32,6 +32,9 @@ h5tov5d_LDADD = @V5D_FILES@
h5fromh4_SOURCES = h5fromh4.c arrayh4.c arrayh4.h $(COMMON_SRC)
h5fromh4_LDADD = @H4_LIBS@
+h4fromh5_SOURCES = h4fromh5.c arrayh4.c arrayh4.h $(COMMON_SRC)
+h4fromh5_LDADD = @H4_LIBS@
+
h5math_SOURCES = h5math.c $(COMMON_SRC)
h5math_LDADD = -lmatheval
diff --git a/Makefile.in b/Makefile.in
index 5ccda12..f04f4b5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 Free Software Foundation, Inc.
+# 2003, 2004, 2005 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,7 +15,7 @@
@SET_MAKE@
-SOURCES = $(h5fromh4_SOURCES) $(h5fromitxt_SOURCES) $(h5fromtxt_SOURCES) $(h5math_SOURCES) $(h5topng_SOURCES) $(h5totxt_SOURCES) $(h5tov5d_SOURCES) $(h5tovtk_SOURCES)
+SOURCES = $(h4fromh5_SOURCES) $(h5fromh4_SOURCES) $(h5fromitxt_SOURCES) $(h5fromtxt_SOURCES) $(h5math_SOURCES) $(h5topng_SOURCES) $(h5totxt_SOURCES) $(h5tov5d_SOURCES) $(h5tovtk_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -41,27 +41,31 @@ noinst_PROGRAMS = h5fromitxt$(EXEEXT)
bin_PROGRAMS = h5totxt$(EXEEXT) h5fromtxt$(EXEEXT) h5tovtk$(EXEEXT) \
@MORE_H5UTILS@ $(am__empty)
EXTRA_PROGRAMS = h5topng$(EXEEXT) h5tov5d$(EXEEXT) h5fromh4$(EXEEXT) \
- h5math$(EXEEXT)
+ h4fromh5$(EXEEXT) h5math$(EXEEXT)
subdir = .
DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
$(nobase_dist_pkgdata_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/h5topng.1.in $(top_srcdir)/configure AUTHORS COPYING \
- ChangeLog INSTALL NEWS compile depcomp install-sh missing \
- mkinstalldirs
+ ChangeLog INSTALL NEWS compile depcomp install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = h5topng.1
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(octdir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
+ "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(octdir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am__objects_1 = arrayh5.$(OBJEXT) h5utils.$(OBJEXT)
+am_h4fromh5_OBJECTS = h4fromh5.$(OBJEXT) arrayh4.$(OBJEXT) \
+ $(am__objects_1)
+h4fromh5_OBJECTS = $(am_h4fromh5_OBJECTS)
+h4fromh5_DEPENDENCIES =
am_h5fromh4_OBJECTS = h5fromh4.$(OBJEXT) arrayh4.$(OBJEXT) \
$(am__objects_1)
h5fromh4_OBJECTS = $(am_h5fromh4_OBJECTS)
@@ -92,28 +96,27 @@ h5tovtk_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/arrayh4.Po ./$(DEPDIR)/arrayh5.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/h5fromh4.Po ./$(DEPDIR)/h5fromitxt.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/h5fromtxt.Po ./$(DEPDIR)/h5math.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/h5topng.Po ./$(DEPDIR)/h5totxt.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/h5tov5d-arrayh5.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/h5tov5d-h5tov5d.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/h5tov5d-h5utils.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/h5tovtk.Po ./$(DEPDIR)/h5utils.Po \
- at AMDEP_TRUE@ ./$(DEPDIR)/writepng.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(h5fromh4_SOURCES) $(h5fromitxt_SOURCES) \
- $(h5fromtxt_SOURCES) $(h5math_SOURCES) $(h5topng_SOURCES) \
- $(h5totxt_SOURCES) $(h5tov5d_SOURCES) $(h5tovtk_SOURCES)
-DIST_SOURCES = $(h5fromh4_SOURCES) $(h5fromitxt_SOURCES) \
- $(h5fromtxt_SOURCES) $(h5math_SOURCES) $(h5topng_SOURCES) \
- $(h5totxt_SOURCES) $(h5tov5d_SOURCES) $(h5tovtk_SOURCES)
+SOURCES = $(h4fromh5_SOURCES) $(h5fromh4_SOURCES) \
+ $(h5fromitxt_SOURCES) $(h5fromtxt_SOURCES) $(h5math_SOURCES) \
+ $(h5topng_SOURCES) $(h5totxt_SOURCES) $(h5tov5d_SOURCES) \
+ $(h5tovtk_SOURCES)
+DIST_SOURCES = $(h4fromh5_SOURCES) $(h5fromh4_SOURCES) \
+ $(h5fromitxt_SOURCES) $(h5fromtxt_SOURCES) $(h5math_SOURCES) \
+ $(h5topng_SOURCES) $(h5totxt_SOURCES) $(h5tov5d_SOURCES) \
+ $(h5tovtk_SOURCES)
man1dir = $(mandir)/man1
NROFF = nroff
MANS = $(dist_man_MANS) $(nodist_man_MANS)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
nobase_dist_pkgdataDATA_INSTALL = $(install_sh_DATA)
octDATA_INSTALL = $(INSTALL_DATA)
DATA = $(nobase_dist_pkgdata_DATA) $(oct_DATA)
@@ -154,6 +157,7 @@ EXEEXT = @EXEEXT@
H4TOH5 = @H4TOH5@
H4_LIBS = @H4_LIBS@
H5READ = @H5READ@
+H5TOH4 = @H5TOH4@
H5TOPNG_MAN = @H5TOPNG_MAN@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -194,6 +198,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
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@
datadir = @datadir@
@@ -220,7 +226,7 @@ colormaps/colorcube colormaps/cool colormaps/copper colormaps/flag \
colormaps/gray colormaps/green colormaps/hot colormaps/hsv \
colormaps/jet colormaps/lines colormaps/pink colormaps/prism \
colormaps/spring colormaps/summer colormaps/vga colormaps/winter \
-colormaps/yarg colormaps/yellow
+colormaps/yarg colormaps/yellow colormaps/dkbluered
EXTRA_MANS = h5topng.1.in h5tov5d.1 h5fromh4.1 h5math.1
EXTRA_DIST = h5read.cc copyright.h $(COLORMAPS) $(EXTRA_MANS)
@@ -238,6 +244,8 @@ h5tov5d_CPPFLAGS = $(AM_CPPFLAGS) @V5D_INCLUDES@
h5tov5d_LDADD = @V5D_FILES@
h5fromh4_SOURCES = h5fromh4.c arrayh4.c arrayh4.h $(COMMON_SRC)
h5fromh4_LDADD = @H4_LIBS@
+h4fromh5_SOURCES = h4fromh5.c arrayh4.c arrayh4.h $(COMMON_SRC)
+h4fromh5_LDADD = @H4_LIBS@
h5math_SOURCES = h5math.c $(COMMON_SRC)
h5math_LDADD = -lmatheval
octdir = @OCT_INSTALL_DIR@
@@ -326,6 +334,9 @@ clean-binPROGRAMS:
clean-noinstPROGRAMS:
-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+h4fromh5$(EXEEXT): $(h4fromh5_OBJECTS) $(h4fromh5_DEPENDENCIES)
+ @rm -f h4fromh5$(EXEEXT)
+ $(LINK) $(h4fromh5_LDFLAGS) $(h4fromh5_OBJECTS) $(h4fromh5_LDADD) $(LIBS)
h5fromh4$(EXEEXT): $(h5fromh4_OBJECTS) $(h5fromh4_DEPENDENCIES)
@rm -f h5fromh4$(EXEEXT)
$(LINK) $(h5fromh4_LDFLAGS) $(h5fromh4_OBJECTS) $(h5fromh4_LDADD) $(LIBS)
@@ -359,6 +370,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/arrayh4.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/arrayh5.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/h4fromh5.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/h5fromh4.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/h5fromitxt.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/h5fromtxt.Po at am__quote@
@@ -376,64 +388,56 @@ distclean-compile:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
h5tov5d-h5tov5d.o: h5tov5d.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(h5tov5d_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT h5tov5d-h5tov5d.o -MD -MP -MF "$(DEPDIR)/h5tov5d-h5tov5d.Tpo" -c -o h5tov5d-h5tov5d.o `test -f 'h5tov5d.c' || echo '$(srcdir)/'`h5tov5d.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/h5tov5d-h5tov5d.Tpo" "$(DEPDIR)/h5tov5d-h5tov5d.Po"; else rm -f "$(DEPDIR)/h5tov5d-h5tov5d.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='h5tov5d.c' object='h5tov5d-h5tov5d.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/h5tov5d-h5tov5d.Po' tmpdepfile='$(DEPDIR)/h5tov5d-h5tov5d.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(h5tov5d_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o h5tov5d-h5tov5d.o `test -f 'h5tov5d.c' || echo '$(srcdir)/'`h5tov5d.c
h5tov5d-h5tov5d.obj: h5tov5d.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(h5tov5d_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT h5tov5d-h5tov5d.obj -MD -MP -MF "$(DEPDIR)/h5tov5d-h5tov5d.Tpo" -c -o h5tov5d-h5tov5d.obj `if test -f 'h5tov5d.c'; then $(CYGPATH_W) 'h5tov5d.c'; else $(CYGPATH_W) '$(srcdir)/h5tov5d.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/h5tov5d-h5tov5d.Tpo" "$(DEPDIR)/h5tov5d-h5tov5d.Po"; else rm -f "$(DEPDIR)/h5tov5d-h5tov5d.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='h5tov5d.c' object='h5tov5d-h5tov5d.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/h5tov5d-h5tov5d.Po' tmpdepfile='$(DEPDIR)/h5tov5d-h5tov5d.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(h5tov5d_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o h5tov5d-h5tov5d.obj `if test -f 'h5tov5d.c'; then $(CYGPATH_W) 'h5tov5d.c'; else $(CYGPATH_W) '$(srcdir)/h5tov5d.c'; fi`
h5tov5d-arrayh5.o: arrayh5.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(h5tov5d_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT h5tov5d-arrayh5.o -MD -MP -MF "$(DEPDIR)/h5tov5d-arrayh5.Tpo" -c -o h5tov5d-arrayh5.o `test -f 'arrayh5.c' || echo '$(srcdir)/'`arrayh5.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/h5tov5d-arrayh5.Tpo" "$(DEPDIR)/h5tov5d-arrayh5.Po"; else rm -f "$(DEPDIR)/h5tov5d-arrayh5.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='arrayh5.c' object='h5tov5d-arrayh5.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/h5tov5d-arrayh5.Po' tmpdepfile='$(DEPDIR)/h5tov5d-arrayh5.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(h5tov5d_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o h5tov5d-arrayh5.o `test -f 'arrayh5.c' || echo '$(srcdir)/'`arrayh5.c
h5tov5d-arrayh5.obj: arrayh5.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(h5tov5d_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT h5tov5d-arrayh5.obj -MD -MP -MF "$(DEPDIR)/h5tov5d-arrayh5.Tpo" -c -o h5tov5d-arrayh5.obj `if test -f 'arrayh5.c'; then $(CYGPATH_W) 'arrayh5.c'; else $(CYGPATH_W) '$(srcdir)/arrayh5.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/h5tov5d-arrayh5.Tpo" "$(DEPDIR)/h5tov5d-arrayh5.Po"; else rm -f "$(DEPDIR)/h5tov5d-arrayh5.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='arrayh5.c' object='h5tov5d-arrayh5.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/h5tov5d-arrayh5.Po' tmpdepfile='$(DEPDIR)/h5tov5d-arrayh5.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(h5tov5d_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o h5tov5d-arrayh5.obj `if test -f 'arrayh5.c'; then $(CYGPATH_W) 'arrayh5.c'; else $(CYGPATH_W) '$(srcdir)/arrayh5.c'; fi`
h5tov5d-h5utils.o: h5utils.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(h5tov5d_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT h5tov5d-h5utils.o -MD -MP -MF "$(DEPDIR)/h5tov5d-h5utils.Tpo" -c -o h5tov5d-h5utils.o `test -f 'h5utils.c' || echo '$(srcdir)/'`h5utils.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/h5tov5d-h5utils.Tpo" "$(DEPDIR)/h5tov5d-h5utils.Po"; else rm -f "$(DEPDIR)/h5tov5d-h5utils.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='h5utils.c' object='h5tov5d-h5utils.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/h5tov5d-h5utils.Po' tmpdepfile='$(DEPDIR)/h5tov5d-h5utils.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(h5tov5d_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o h5tov5d-h5utils.o `test -f 'h5utils.c' || echo '$(srcdir)/'`h5utils.c
h5tov5d-h5utils.obj: h5utils.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(h5tov5d_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT h5tov5d-h5utils.obj -MD -MP -MF "$(DEPDIR)/h5tov5d-h5utils.Tpo" -c -o h5tov5d-h5utils.obj `if test -f 'h5utils.c'; then $(CYGPATH_W) 'h5utils.c'; else $(CYGPATH_W) '$(srcdir)/h5utils.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/h5tov5d-h5utils.Tpo" "$(DEPDIR)/h5tov5d-h5utils.Po"; else rm -f "$(DEPDIR)/h5tov5d-h5utils.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='h5utils.c' object='h5tov5d-h5utils.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/h5tov5d-h5utils.Po' tmpdepfile='$(DEPDIR)/h5tov5d-h5utils.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(h5tov5d_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o h5tov5d-h5utils.obj `if test -f 'h5utils.c'; then $(CYGPATH_W) 'h5utils.c'; else $(CYGPATH_W) '$(srcdir)/h5utils.c'; fi`
uninstall-info-am:
install-man1: $(man1_MANS) $(man_MANS)
@@ -484,25 +488,19 @@ uninstall-man1:
install-nobase_dist_pkgdataDATA: $(nobase_dist_pkgdata_DATA)
@$(NORMAL_INSTALL)
test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ @$(am__vpath_adj_setup) \
list='$(nobase_dist_pkgdata_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac; \
+ $(am__vpath_adj) \
echo " $(nobase_dist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
$(nobase_dist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
done
uninstall-nobase_dist_pkgdataDATA:
@$(NORMAL_UNINSTALL)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ @$(am__vpath_adj_setup) \
list='$(nobase_dist_pkgdata_DATA)'; for p in $$list; do \
- case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac; \
+ $(am__vpath_adj) \
echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
done
@@ -511,7 +509,7 @@ install-octDATA: $(oct_DATA)
test -z "$(octdir)" || $(mkdir_p) "$(DESTDIR)$(octdir)"
@list='$(oct_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
+ f=$(am__strip_dir) \
echo " $(octDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(octdir)/$$f'"; \
$(octDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(octdir)/$$f"; \
done
@@ -519,7 +517,7 @@ install-octDATA: $(oct_DATA)
uninstall-octDATA:
@$(NORMAL_UNINSTALL)
@list='$(oct_DATA)'; for p in $$list; do \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
+ f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(octdir)/$$f'"; \
rm -f "$(DESTDIR)$(octdir)/$$f"; \
done
@@ -545,7 +543,7 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -z "$$unique" && unique=$$empty_fix; \
+ test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique; \
fi
@@ -608,15 +606,15 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
dist-bzip2: distdir
- $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
dist-tarZ: distdir
- $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
dist-shar: distdir
@@ -629,7 +627,7 @@ dist-zip: distdir
$(am__remove_distdir)
dist dist-all: distdir
- $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
@@ -638,11 +636,11 @@ dist dist-all: distdir
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
+ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
*.zip*) \
@@ -725,7 +723,7 @@ mostlyclean-generic:
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
diff --git a/NEWS b/NEWS
index 6601ef4..af0a607 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+h5utils 1.10 (9/2/05)
+
+ * Added h4fromh5 utility. (NCSA seems to be no longer shipping
+ the HDF5/HDF4 conversion tools with the latest HDF5 release.)
+
+ * Added dkbluered color map, which is similar to bluered but
+ uses a somewhat wider range of colors.
+
h5utils 1.9.1 (8/5/04)
* Fix h5topng compilation failure with some non-C99 compilers;
diff --git a/aclocal.m4 b/aclocal.m4
index 0f5feed..2b84dd9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.8.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005 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.
@@ -11,55 +11,32 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# -*- Autoconf -*-
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-# Generated from amversion.in; do not edit by hand.
-
-# 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 2, 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# Copyright (C) 2002, 2003, 2005 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.
# 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.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.8.4])])
+ [AM_AUTOMAKE_VERSION([1.9.5])])
-# AM_AUX_DIR_EXPAND
+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001, 2003 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
-# the Free Software Foundation; either version 2, 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2003, 2005 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.
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
@@ -106,26 +83,16 @@ AC_PREREQ([2.50])dnl
am_aux_dir=`cd $ac_aux_dir && pwd`
])
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+# AM_CONDITIONAL -*- Autoconf -*-
-# 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 2, 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# 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 6
+# serial 7
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
@@ -145,30 +112,19 @@ else
fi
AC_CONFIG_COMMANDS_PRE(
[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.])
+ AC_MSG_ERROR([[conditional "$1" was never defined.
+Usually this means the macro was only invoked conditionally.]])
fi])])
-# serial 7 -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
# 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.
-# 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 2, 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
+# serial 8
# 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,
@@ -177,7 +133,6 @@ fi])])
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
@@ -317,26 +272,16 @@ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])
])
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# Generate code to set up dependency tracking. -*- Autoconf -*-
-# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# 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
+#serial 3
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
@@ -355,27 +300,21 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
else
continue
fi
- grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
- # Extract the definition of DEP_FILES from the Makefile without
- # running `make'.
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
# When using ansi2knr, U may be empty or an underscore; expand it
U=`sed -n 's/^U = //p' < "$mf"`
- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
- # We invoke sed twice because it is the simplest approach to
- # changing $(DEPDIR) to its actual value in the expansion.
- for file in `sed -n '
- /^DEP_FILES = .*\\\\$/ {
- s/^DEP_FILES = //
- :loop
- s/\\\\$//
- p
- n
- /\\\\$/ b loop
- p
- }
- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -401,54 +340,31 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 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
-# the Free Software Foundation; either version 2, 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# 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 7
+# serial 8
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-# Do all the work for Automake. -*- Autoconf -*-
-
-# This macro actually does too much some checks are only needed if
-# your package does certain things. But this isn't really a big deal.
+# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
# 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.
-# 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 2, 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# serial 12
-# serial 11
+# This macro actually does too much. Some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
# AM_INIT_AUTOMAKE([OPTIONS])
@@ -506,7 +422,6 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
AM_MISSING_PROG(AUTOHEADER, autoheader)
AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
AM_PROG_INSTALL_SH
AM_PROG_INSTALL_STRIP
AC_REQUIRE([AM_PROG_MKDIR_P])dnl
@@ -515,7 +430,9 @@ AC_REQUIRE([AM_PROG_MKDIR_P])dnl
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-
+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+ [_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
[_AM_DEPENDENCIES(CC)],
@@ -549,51 +466,27 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+# Copyright (C) 2001, 2003, 2005 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.
+
# AM_PROG_INSTALL_SH
# ------------------
# Define $install_sh.
-
-# Copyright (C) 2001, 2003 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
-# the Free Software Foundation; either version 2, 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
install_sh=${install_sh-"$am_aux_dir/install-sh"}
AC_SUBST(install_sh)])
-# -*- Autoconf -*-
-# Copyright (C) 2003 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
-# the Free Software Foundation; either version 2, 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2003, 2005 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 1
+# serial 2
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
@@ -608,28 +501,17 @@ fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
-# Add --enable-maintainer-mode option to configure.
+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
# 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.
-# 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 2, 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
+# serial 4
AC_DEFUN([AM_MAINTAINER_MODE],
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
@@ -648,26 +530,15 @@ AC_DEFUN([AM_MAINTAINER_MODE],
AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-# Check to see how 'make' treats includes. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# Check to see how 'make' treats includes. -*- Autoconf -*-
-# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2002, 2003, 2005 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
+# serial 3
# AM_MAKE_INCLUDE()
# -----------------
@@ -711,27 +582,16 @@ AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
-# -*- Autoconf -*-
-
+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 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
-# the Free Software Foundation; either version 2, 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# 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 3
+# serial 4
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
@@ -757,27 +617,16 @@ else
fi
])
+# Copyright (C) 2003, 2004, 2005 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.
+
# AM_PROG_MKDIR_P
# ---------------
# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-
-# Copyright (C) 2003, 2004 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
-# the Free Software Foundation; either version 2, 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
+#
# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
# created by `make install' are always world readable, even if the
# installer happens to have an overly restrictive umask (e.g. 077).
@@ -798,13 +647,21 @@ fi
# this.)
AC_DEFUN([AM_PROG_MKDIR_P],
[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # Keeping the `.' argument allows $(mkdir_p) to be used without
- # argument. Indeed, we sometimes output rules like
+ # We used to keeping the `.' as first argument, in order to
+ # allow $(mkdir_p) to be used without argument. As in
# $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined.
- # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
- # expensive solution, as it forces Make to start a sub-shell.)
- mkdir_p='mkdir -p -- .'
+ # where $(somedir) is conditionally defined. However this is wrong
+ # for two reasons:
+ # 1. if the package is installed by a user who cannot write `.'
+ # make install will fail,
+ # 2. the above comment should most certainly read
+ # $(mkdir_p) $(DESTDIR)$(somedir)
+ # so it does not work when $(somedir) is undefined and
+ # $(DESTDIR) is not.
+ # To support the latter case, we have to write
+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+ # so the `.' trick is pointless.
+ mkdir_p='mkdir -p --'
else
# On NextStep and OpenStep, the `mkdir' command does not
# recognize any option. It will interpret all options as
@@ -823,26 +680,15 @@ else
fi
AC_SUBST([mkdir_p])])
-# Helper functions for option handling. -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003 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
-# the Free Software Foundation; either version 2, 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.
+# Helper functions for option handling. -*- Autoconf -*-
-# 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2002, 2003, 2005 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
+# serial 3
# _AM_MANGLE_OPTION(NAME)
# -----------------------
@@ -867,28 +713,16 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-#
-# Check to make sure that the build environment is sane.
-#
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# 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.
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# 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.
-# 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
+# serial 4
# AM_SANITY_CHECK
# ---------------
@@ -931,25 +765,14 @@ Check your system clock])
fi
AC_MSG_RESULT(yes)])
-# AM_PROG_INSTALL_STRIP
-
-# Copyright (C) 2001, 2003 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
-# the Free Software Foundation; either version 2, 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Copyright (C) 2001, 2003, 2005 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.
+# AM_PROG_INSTALL_STRIP
+# ---------------------
# One issue with vendor `install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
@@ -970,3 +793,99 @@ fi
INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
+# Check how to create a tarball. -*- Autoconf -*-
+
+# Copyright (C) 2004, 2005 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
+
+# _AM_PROG_TAR(FORMAT)
+# --------------------
+# Check how to create a tarball in format FORMAT.
+# FORMAT should be one of `v7', `ustar', or `pax'.
+#
+# Substitute a variable $(am__tar) that is a command
+# writing to stdout a FORMAT-tarball containing the directory
+# $tardir.
+# tardir=directory && $(am__tar) > result.tar
+#
+# Substitute a variable $(am__untar) that extract such
+# a tarball read from stdin.
+# $(am__untar) < result.tar
+AC_DEFUN([_AM_PROG_TAR],
+[# Always define AMTAR for backward compatibility.
+AM_MISSING_PROG([AMTAR], [tar])
+m4_if([$1], [v7],
+ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+ [m4_case([$1], [ustar],, [pax],,
+ [m4_fatal([Unknown tar format])])
+AC_MSG_CHECKING([how to create a $1 tar archive])
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar;
+ do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
+
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+done
+rm -rf conftest.dir
+
+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+AC_SUBST([am__tar])
+AC_SUBST([am__untar])
+]) # _AM_PROG_TAR
+
diff --git a/arrayh4.c b/arrayh4.c
index cdd2f9e..3de110d 100644
--- a/arrayh4.c
+++ b/arrayh4.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+/* Copyright (c) 2005 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff --git a/arrayh5.c b/arrayh5.c
index 4d251ad..ab67aa1 100644
--- a/arrayh5.c
+++ b/arrayh5.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+/* Copyright (c) 2005 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff --git a/colormaps/autumn b/colormaps/autumn
index 2c4209b..f28424b 100644
--- a/colormaps/autumn
+++ b/colormaps/autumn
@@ -1,17 +1,3 @@
-# red-yellow color map (from Matlab)
+# red-yellow color map (based on Matlab colormap)
1.0000000e+00 0.0000000e+00 0.0000000e+00 1
- 1.0000000e+00 6.6666667e-02 0.0000000e+00 1
- 1.0000000e+00 1.3333333e-01 0.0000000e+00 1
- 1.0000000e+00 2.0000000e-01 0.0000000e+00 1
- 1.0000000e+00 2.6666667e-01 0.0000000e+00 1
- 1.0000000e+00 3.3333333e-01 0.0000000e+00 1
- 1.0000000e+00 4.0000000e-01 0.0000000e+00 1
- 1.0000000e+00 4.6666667e-01 0.0000000e+00 1
- 1.0000000e+00 5.3333333e-01 0.0000000e+00 1
- 1.0000000e+00 6.0000000e-01 0.0000000e+00 1
- 1.0000000e+00 6.6666667e-01 0.0000000e+00 1
- 1.0000000e+00 7.3333333e-01 0.0000000e+00 1
- 1.0000000e+00 8.0000000e-01 0.0000000e+00 1
- 1.0000000e+00 8.6666667e-01 0.0000000e+00 1
- 1.0000000e+00 9.3333333e-01 0.0000000e+00 1
1.0000000e+00 1.0000000e+00 0.0000000e+00 1
diff --git a/colormaps/cool b/colormaps/cool
index 59e2603..24b805b 100644
--- a/colormaps/cool
+++ b/colormaps/cool
@@ -1,17 +1,3 @@
-# cyan-magenta color map (from Matlab)
+# cyan-magenta color map (based on Matlab colormap)
0.0000000e+00 1.0000000e+00 1.0000000e+00 1
- 6.6666667e-02 9.3333333e-01 1.0000000e+00 1
- 1.3333333e-01 8.6666667e-01 1.0000000e+00 1
- 2.0000000e-01 8.0000000e-01 1.0000000e+00 1
- 2.6666667e-01 7.3333333e-01 1.0000000e+00 1
- 3.3333333e-01 6.6666667e-01 1.0000000e+00 1
- 4.0000000e-01 6.0000000e-01 1.0000000e+00 1
- 4.6666667e-01 5.3333333e-01 1.0000000e+00 1
- 5.3333333e-01 4.6666667e-01 1.0000000e+00 1
- 6.0000000e-01 4.0000000e-01 1.0000000e+00 1
- 6.6666667e-01 3.3333333e-01 1.0000000e+00 1
- 7.3333333e-01 2.6666667e-01 1.0000000e+00 1
- 8.0000000e-01 2.0000000e-01 1.0000000e+00 1
- 8.6666667e-01 1.3333333e-01 1.0000000e+00 1
- 9.3333333e-01 6.6666667e-02 1.0000000e+00 1
1.0000000e+00 0.0000000e+00 1.0000000e+00 1
diff --git a/colormaps/dkbluered b/colormaps/dkbluered
new file mode 100644
index 0000000..5fcf9e8
--- /dev/null
+++ b/colormaps/dkbluered
@@ -0,0 +1,33 @@
+# darkblue-blue-white-red-darkred color map, based loosely on "Seismic"
+# color table from Spyglass Transform
+ 0.03 0.00 0.20 1
+ 0.07 0.00 0.31 1
+ 0.10 0.00 0.42 1
+ 0.11 0.00 0.53 1
+ 0.10 0.00 0.64 1
+ 0.09 0.00 0.75 1
+ 0.06 0.00 0.86 1
+ 0.01 0.00 0.97 1
+ 0.08 0.13 1.00 1
+ 0.22 0.30 1.00 1
+ 0.35 0.46 1.00 1
+ 0.48 0.60 1.00 1
+ 0.61 0.73 1.00 1
+ 0.75 0.83 1.00 1
+ 0.88 0.93 1.00 1
+ 1.00 1.00 1.00 1
+ 1.00 0.93 0.88 1
+ 1.00 0.83 0.75 1
+ 1.00 0.73 0.61 1
+ 1.00 0.60 0.48 1
+ 1.00 0.46 0.35 1
+ 1.00 0.30 0.22 1
+ 1.00 0.13 0.08 1
+ 0.97 0.00 0.01 1
+ 0.86 0.00 0.06 1
+ 0.75 0.00 0.09 1
+ 0.64 0.00 0.10 1
+ 0.53 0.00 0.11 1
+ 0.42 0.00 0.10 1
+ 0.31 0.00 0.07 1
+ 0.21 0.00 0.03 1
diff --git a/colormaps/winter b/colormaps/winter
index 682a104..19c8f7e 100644
--- a/colormaps/winter
+++ b/colormaps/winter
@@ -1,17 +1,3 @@
-# blue-green color map (from Matlab)
+# blue-green color map (based on Matlab colormap)
0.0000000e+00 0.0000000e+00 1.0000000e+00 1
- 0.0000000e+00 6.6666667e-02 9.6666667e-01 1
- 0.0000000e+00 1.3333333e-01 9.3333333e-01 1
- 0.0000000e+00 2.0000000e-01 9.0000000e-01 1
- 0.0000000e+00 2.6666667e-01 8.6666667e-01 1
- 0.0000000e+00 3.3333333e-01 8.3333333e-01 1
- 0.0000000e+00 4.0000000e-01 8.0000000e-01 1
- 0.0000000e+00 4.6666667e-01 7.6666667e-01 1
- 0.0000000e+00 5.3333333e-01 7.3333333e-01 1
- 0.0000000e+00 6.0000000e-01 7.0000000e-01 1
- 0.0000000e+00 6.6666667e-01 6.6666667e-01 1
- 0.0000000e+00 7.3333333e-01 6.3333333e-01 1
- 0.0000000e+00 8.0000000e-01 6.0000000e-01 1
- 0.0000000e+00 8.6666667e-01 5.6666667e-01 1
- 0.0000000e+00 9.3333333e-01 5.3333333e-01 1
0.0000000e+00 1.0000000e+00 5.0000000e-01 1
diff --git a/compile b/compile
index a81e000..ad57e2f 100755
--- a/compile
+++ b/compile
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand `-c -o'.
-scriptversion=2003-11-09.00
+scriptversion=2005-02-03.08
-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey at cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
@@ -47,45 +47,49 @@ right script to run: please start by reading the file `INSTALL'.
Report bugs to <bug-automake at gnu.org>.
EOF
- exit 0
+ exit $?
;;
-v | --v*)
echo "compile $scriptversion"
- exit 0
+ exit $?
;;
esac
-
-prog=$1
-shift
-
ofile=
cfile=
-args=
-while test $# -gt 0; do
- case "$1" in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we do something ugly here.
- ofile=$2
- shift
- case "$ofile" in
- *.o | *.obj)
- ;;
- *)
- args="$args -o $ofile"
- ofile=
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- args="$args $1"
- ;;
- *)
- args="$args $1"
- ;;
- esac
+eat=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as `compile cc -o foo foo.c'.
+ # So we strip `-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
shift
done
@@ -95,36 +99,38 @@ if test -z "$ofile" || test -z "$cfile"; then
# normal compilation that the losing compiler can handle. If no
# `.c' file was seen then we are probably linking. That is also
# ok.
- exec "$prog" $args
+ exec "$@"
fi
# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
# Create the lock directory.
# Note: use `[/.-]' here to ensure that we don't use the same name
# that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
- if mkdir $lockdir > /dev/null 2>&1; then
+ if mkdir "$lockdir" >/dev/null 2>&1; then
break
fi
sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
+trap "rmdir '$lockdir'; exit 1" 1 2 15
# Run the compile.
-"$prog" $args
-status=$?
+"$@"
+ret=$?
if test -f "$cofile"; then
mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ mv "${cofile}bj" "$ofile"
fi
-rmdir $lockdir
-exit $status
+rmdir "$lockdir"
+exit $ret
# Local Variables:
# mode: shell-script
diff --git a/configure b/configure
index 63a28f4..b56a2c2 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for h5utils 1.9.1.
+# Generated by GNU Autoconf 2.59 for h5utils 1.10.
#
# Report bugs to <stevenj at alum.mit.edu>.
#
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='h5utils'
PACKAGE_TARNAME='h5utils'
-PACKAGE_VERSION='1.9.1'
-PACKAGE_STRING='h5utils 1.9.1'
+PACKAGE_VERSION='1.10'
+PACKAGE_STRING='h5utils 1.10'
PACKAGE_BUGREPORT='stevenj at alum.mit.edu'
ac_unique_file="h5topng.c"
@@ -311,7 +311,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STR [...]
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INS [...]
ac_subst_files=''
# Initialize some variables set by options.
@@ -780,7 +780,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures h5utils 1.9.1 to adapt to many kinds of systems.
+\`configure' configures h5utils 1.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -842,7 +842,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of h5utils 1.9.1:";;
+ short | recursive ) echo "Configuration of h5utils 1.10:";;
esac
cat <<\_ACEOF
@@ -857,7 +857,8 @@ Optional Features:
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --without-h5fromh4 don't compile h5fromh4
+ --with-hdf4 build hdf4 utils even if h4toh5 and h5toh4 are
+ present
--without-octave don't compile h5read Octave plugin
--with-v5d=<dir> use Vis5d in <dir> for h5tov5d
@@ -969,7 +970,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-h5utils configure 1.9.1
+h5utils configure 1.10
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -983,7 +984,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by h5utils $as_me 1.9.1, which was
+It was created by h5utils $as_me 1.10, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1319,7 +1320,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-am__api_version="1.8"
+am__api_version="1.9"
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
if test -f $ac_dir/install-sh; then
@@ -1496,13 +1497,21 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # Keeping the `.' argument allows $(mkdir_p) to be used without
- # argument. Indeed, we sometimes output rules like
+ # We used to keeping the `.' as first argument, in order to
+ # allow $(mkdir_p) to be used without argument. As in
# $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined.
- # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
- # expensive solution, as it forces Make to start a sub-shell.)
- mkdir_p='mkdir -p -- .'
+ # where $(somedir) is conditionally defined. However this is wrong
+ # for two reasons:
+ # 1. if the package is installed by a user who cannot write `.'
+ # make install will fail,
+ # 2. the above comment should most certainly read
+ # $(mkdir_p) $(DESTDIR)$(somedir)
+ # so it does not work when $(somedir) is undefined and
+ # $(DESTDIR) is not.
+ # To support the latter case, we have to write
+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+ # so the `.' trick is pointless.
+ mkdir_p='mkdir -p --'
else
# On NextStep and OpenStep, the `mkdir' command does not
# recognize any option. It will interpret all options as
@@ -1618,7 +1627,7 @@ fi
# Define the identity of the package.
PACKAGE='h5utils'
- VERSION='1.9.1'
+ VERSION='1.10'
cat >>confdefs.h <<_ACEOF
@@ -1646,9 +1655,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
install_sh=${install_sh-"$am_aux_dir/install-sh"}
# Installed binaries are usually stripped using `strip' when the user
@@ -1741,6 +1747,13 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
+# Always define AMTAR for backward compatibility.
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+
@@ -3742,7 +3755,7 @@ fi
###########################################################################
# Only build h5fromh4 if we are using a version of HDF5 prior to 1.4, and
-# thus don't have the superior h4toh5 utility.
+# thus don't have the superior h4toh5 utility. Similarly for h5toh4.
# Extract the first word of "h4toh5", so it can be a program name with args.
set dummy h4toh5; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -3778,23 +3791,60 @@ else
echo "${ECHO_T}no" >&6
fi
+# Extract the first word of "h5toh4", so it can be a program name with args.
+set dummy h5toh4; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_H5TOH4+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$H5TOH4"; then
+ ac_cv_prog_H5TOH4="$H5TOH4" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_H5TOH4="h5toh4"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+H5TOH4=$ac_cv_prog_H5TOH4
+if test -n "$H5TOH4"; then
+ echo "$as_me:$LINENO: result: $H5TOH4" >&5
+echo "${ECHO_T}$H5TOH4" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
-# Check whether --with-h5fromh4 or --without-h5fromh4 was given.
-if test "${with_h5fromh4+set}" = set; then
- withval="$with_h5fromh4"
+# Check whether --with-hdf4 or --without-hdf4 was given.
+if test "${with_hdf4+set}" = set; then
+ withval="$with_hdf4"
ok=$withval
else
ok=maybe
fi;
if test "x$ok" = xyes; then
H4TOH5=""
+ H5TOH4=""
elif test "x$ok" = xno; then
H4TOH5="h4toh5"
+ H5TOH4="h5toh4"
fi
-H5FROMH4=no
-if test "x$H4TOH5" != xh4toh5; then
+HDF4=no
+if test "x$H4TOH5" != xh4toh5 -o "x$H5TOH4" != xh5toh4; then
echo "$as_me:$LINENO: checking for jpeg_start_compress in -ljpeg" >&5
echo $ECHO_N "checking for jpeg_start_compress in -ljpeg... $ECHO_C" >&6
if test "${ac_cv_lib_jpeg_jpeg_start_compress+set}" = set; then
@@ -3925,21 +3975,27 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_df_DFSDgetdata" >&5
echo "${ECHO_T}$ac_cv_lib_df_DFSDgetdata" >&6
if test $ac_cv_lib_df_DFSDgetdata = yes; then
- H4_LIBS="-ldf -ljpeg"; H5FROMH4=yes
+ H4_LIBS="-ldf -ljpeg"; HDF4=yes
else
- { echo "$as_me:$LINENO: WARNING: can't find libdf (HDF4): won't be able to compile h5fromh4" >&5
-echo "$as_me: WARNING: can't find libdf (HDF4): won't be able to compile h5fromh4" >&2;}
+ { echo "$as_me:$LINENO: WARNING: can't find libdf (HDF4): won't be able to compile h5fromh4 or h4fromh5" >&5
+echo "$as_me: WARNING: can't find libdf (HDF4): won't be able to compile h5fromh4 or h4fromh5" >&2;}
fi
else
- { echo "$as_me:$LINENO: WARNING: can't find libjpeg: won't be able to compile h5fromh4" >&5
-echo "$as_me: WARNING: can't find libjpeg: won't be able to compile h5fromh4" >&2;}
+ { echo "$as_me:$LINENO: WARNING: can't find libjpeg: won't be able to compile h5fromh4 or h4fromh5" >&5
+echo "$as_me: WARNING: can't find libjpeg: won't be able to compile h5fromh4 or h4fromh5" >&2;}
fi
- if test $H5FROMH4 = yes; then
- MORE_H5UTILS="h5fromh4 $MORE_H5UTILS"
- MORE_H5UTILS_MANS="h5fromh4.1 $MORE_H5UTILS_MANS"
+ if test $HDF4 = yes; then
+ if test "x$H4TOH5" != xh4toh5; then
+ MORE_H5UTILS="h5fromh4 $MORE_H5UTILS"
+ MORE_H5UTILS_MANS="h5fromh4.1 $MORE_H5UTILS_MANS"
+ fi
+ if test "x$H5TOH4" != xh5toh4; then
+ MORE_H5UTILS="h4fromh5 $MORE_H5UTILS"
+ # MORE_H5UTILS_MANS="h4fromh5.1 $MORE_H5UTILS_MANS"
+ fi
fi
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
@@ -6511,7 +6567,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by h5utils $as_me 1.9.1, which was
+This file was extended by h5utils $as_me 1.10, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6574,7 +6630,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-h5utils config.status 1.9.1
+h5utils config.status 1.10
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -6784,7 +6840,6 @@ s, at AUTOCONF@,$AUTOCONF,;t t
s, at AUTOMAKE@,$AUTOMAKE,;t t
s, at AUTOHEADER@,$AUTOHEADER,;t t
s, at MAKEINFO@,$MAKEINFO,;t t
-s, at AMTAR@,$AMTAR,;t t
s, at install_sh@,$install_sh,;t t
s, at STRIP@,$STRIP,;t t
s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
@@ -6793,6 +6848,9 @@ s, at mkdir_p@,$mkdir_p,;t t
s, at AWK@,$AWK,;t t
s, at SET_MAKE@,$SET_MAKE,;t t
s, at am__leading_dot@,$am__leading_dot,;t t
+s, at AMTAR@,$AMTAR,;t t
+s, at am__tar@,$am__tar,;t t
+s, at am__untar@,$am__untar,;t t
s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
s, at MAINT@,$MAINT,;t t
@@ -6817,6 +6875,7 @@ s, at EGREP@,$EGREP,;t t
s, at H5TOPNG_MAN@,$H5TOPNG_MAN,;t t
s, at PNG_LIBS@,$PNG_LIBS,;t t
s, at H4TOH5@,$H4TOH5,;t t
+s, at H5TOH4@,$H5TOH4,;t t
s, at H4_LIBS@,$H4_LIBS,;t t
s, at MKOCTFILE@,$MKOCTFILE,;t t
s, at OCTAVE@,$OCTAVE,;t t
@@ -7451,27 +7510,21 @@ echo X"$mf" |
else
continue
fi
- grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
- # Extract the definition of DEP_FILES from the Makefile without
- # running `make'.
+ # Extract the definition of DEPDIR, am__include, and am__quote
+ # from the Makefile without running `make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
+ test -z "am__include" && continue
+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
# When using ansi2knr, U may be empty or an underscore; expand it
U=`sed -n 's/^U = //p' < "$mf"`
- test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
- # We invoke sed twice because it is the simplest approach to
- # changing $(DEPDIR) to its actual value in the expansion.
- for file in `sed -n '
- /^DEP_FILES = .*\\\\$/ {
- s/^DEP_FILES = //
- :loop
- s/\\\\$//
- p
- n
- /\\\\$/ b loop
- p
- }
- /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+ # Find all dependency output files, they are included files with
+ # $(DEPDIR) in their names. We invoke sed twice because it is the
+ # simplest approach to changing $(DEPDIR) to its actual value in the
+ # expansion.
+ for file in `sed -n "
+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
diff --git a/configure.ac b/configure.ac
index 78a2e32..dfd2a83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT(h5utils, 1.9.1, stevenj at alum.mit.edu)
+AC_INIT(h5utils, 1.10, stevenj at alum.mit.edu)
AM_INIT_AUTOMAKE(1.6)
AC_CONFIG_SRCDIR([h5topng.c])
AM_CONFIG_HEADER(config.h)
@@ -74,29 +74,38 @@ fi
###########################################################################
# Only build h5fromh4 if we are using a version of HDF5 prior to 1.4, and
-# thus don't have the superior h4toh5 utility.
+# thus don't have the superior h4toh5 utility. Similarly for h5toh4.
AC_CHECK_PROG(H4TOH5, h4toh5, h4toh5)
+AC_CHECK_PROG(H5TOH4, h5toh4, h5toh4)
-AC_ARG_WITH(h5fromh4,
- [AC_HELP_STRING([--without-h5fromh4], [don't compile h5fromh4])],
+AC_ARG_WITH(hdf4,
+ [AC_HELP_STRING([--with-hdf4], [build hdf4 utils even if h4toh5 and h5toh4 are present])],
ok=$withval, ok=maybe)
if test "x$ok" = xyes; then
H4TOH5=""
+ H5TOH4=""
elif test "x$ok" = xno; then
H4TOH5="h4toh5"
+ H5TOH4="h5toh4"
fi
-H5FROMH4=no
-if test "x$H4TOH5" != xh4toh5; then
+HDF4=no
+if test "x$H4TOH5" != xh4toh5 -o "x$H5TOH4" != xh5toh4; then
AC_CHECK_LIB(jpeg, jpeg_start_compress,
[AC_CHECK_LIB(df, DFSDgetdata,
- [H4_LIBS="-ldf -ljpeg"; H5FROMH4=yes],
- [AC_MSG_WARN([can't find libdf (HDF4): won't be able to compile h5fromh4])], -ljpeg)],
- [AC_MSG_WARN([can't find libjpeg: won't be able to compile h5fromh4])])
-
- if test $H5FROMH4 = yes; then
- MORE_H5UTILS="h5fromh4 $MORE_H5UTILS"
- MORE_H5UTILS_MANS="h5fromh4.1 $MORE_H5UTILS_MANS"
+ [H4_LIBS="-ldf -ljpeg"; HDF4=yes],
+ [AC_MSG_WARN([can't find libdf (HDF4): won't be able to compile h5fromh4 or h4fromh5])], -ljpeg)],
+ [AC_MSG_WARN([can't find libjpeg: won't be able to compile h5fromh4 or h4fromh5])])
+
+ if test $HDF4 = yes; then
+ if test "x$H4TOH5" != xh4toh5; then
+ MORE_H5UTILS="h5fromh4 $MORE_H5UTILS"
+ MORE_H5UTILS_MANS="h5fromh4.1 $MORE_H5UTILS_MANS"
+ fi
+ if test "x$H5TOH4" != xh5toh4; then
+ MORE_H5UTILS="h4fromh5 $MORE_H5UTILS"
+ # MORE_H5UTILS_MANS="h4fromh5.1 $MORE_H5UTILS_MANS"
+ fi
fi
fi
AC_CHECK_HEADERS(hdf.h hdf/hdf.h)
diff --git a/copyright.h b/copyright.h
index 3818bfd..2b32691 100644
--- a/copyright.h
+++ b/copyright.h
@@ -4,7 +4,7 @@
/* License and copyright string for inclusion in program output: */
#define COPYRIGHT \
-"Copyright (c) 2004 Massachusetts Institute of Technology\n"\
+"Copyright (c) 2005 Massachusetts Institute of Technology\n"\
"\n"\
"Permission is hereby granted, free of charge, to any person obtaining\n"\
"a copy of this software and associated documentation files (the\n"\
diff --git a/depcomp b/depcomp
index 25bdb18..ffcd540 100755
--- a/depcomp
+++ b/depcomp
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2004-04-25.13
+scriptversion=2005-02-09.22
-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 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
@@ -43,17 +43,18 @@ Environment variables:
depmode Dependency tracking mode.
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.
libtool Whether libtool is used (yes/no).
Report bugs to <bug-automake at gnu.org>.
EOF
- exit 0
+ exit $?
;;
-v | --v*)
echo "depcomp $scriptversion"
- exit 0
+ exit $?
;;
esac
@@ -61,18 +62,10 @@ 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
fi
-# `libtool' can also be set to `yes' or `no'.
-
-if test -z "$depfile"; then
- base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
- dir=`echo "$object" | sed 's,/.*$,/,'`
- if test "$dir" = "$object"; then
- dir=
- fi
- # FIXME: should be _deps on DOS.
- depfile="$dir.deps/$base"
-fi
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
@@ -294,33 +287,43 @@ tru64)
base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
- # Dependencies are output in .lo.d with libtool 1.4.
- # They are output in .o.d with libtool 1.5.
- tmpdepfile1="$dir.libs/$base.lo.d"
- tmpdepfile2="$dir.libs/$base.o.d"
- tmpdepfile3="$dir.libs/$base.d"
+ # With Tru64 cc, shared objects can also be used to make a
+ # static library. This mecanism is used in libtool 1.4 series to
+ # handle both shared and static libraries in a single compilation.
+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+ #
+ # With libtool 1.5 this exception was removed, and libtool now
+ # generates 2 separate objects for the 2 libraries. These two
+ # compilations output dependencies in in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+ # automatically cleaned when .libs/ is deleted, while ignoring
+ # the former would cause a distcleancheck panic.
+ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
+ tmpdepfile2=$dir$base.o.d # libtool 1.5
+ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
+ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
"$@" -Wc,-MD
else
- tmpdepfile1="$dir$base.o.d"
- tmpdepfile2="$dir$base.d"
- tmpdepfile3="$dir$base.d"
+ tmpdepfile1=$dir$base.o.d
+ tmpdepfile2=$dir$base.d
+ tmpdepfile3=$dir$base.d
+ tmpdepfile4=$dir$base.d
"$@" -MD
fi
stat=$?
if test $stat -eq 0; then :
else
- rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
exit $stat
fi
- if test -f "$tmpdepfile1"; then
- tmpdepfile="$tmpdepfile1"
- elif test -f "$tmpdepfile2"; then
- tmpdepfile="$tmpdepfile2"
- else
- tmpdepfile="$tmpdepfile3"
- fi
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+ do
+ test -f "$tmpdepfile" && break
+ done
if test -f "$tmpdepfile"; then
sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
# That's a tab and a space in the [].
diff --git a/h5fromh4.c b/h4fromh5.c
similarity index 53%
copy from h5fromh4.c
copy to h4fromh5.c
index 744742e..a32ae4d 100644
--- a/h5fromh4.c
+++ b/h4fromh5.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+/* Copyright (c) 2005 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@@ -32,60 +32,55 @@
#include "copyright.h"
#include "h5utils.h"
-#define CHECK(cond, msg) { if (!(cond)) { fprintf(stderr, "h5fromh4 error: %s\n", msg); exit(EXIT_FAILURE); } }
+#define CHECK(cond, msg) { if (!(cond)) { fprintf(stderr, "h4fromh5 error: %s\n", msg); exit(EXIT_FAILURE); } }
void usage(FILE *f)
{
- fprintf(f, "Usage: h5fromh4 [options] [<hdf4-files>]\n"
+ fprintf(f, "Usage: h4fromh5 [options] [<hdf4-files>]\n"
"Options:\n"
" -h : this help message\n"
" -V : print version number and copyright\n"
" -v : verbose output\n"
- " -o <file> : output to HDF5 file <file>\n"
- " -a : append to existing hdf5 file\n"
- " -d <name> : use dataset <name> in the output file (default: \"data\")\n"
+ " -T : transposed output\n"
+ " -o <file> : output to HDF4 file <file>\n"
+ " -d <name> : use dataset <name> in the input file\n"
" -- you can also specify a dataset via <file>:<name>\n"
);
}
int main(int argc, char **argv)
{
- char *dname, *h5_fname = NULL;
+ char *h4_fname = NULL;
char *data_name = NULL;
extern char *optarg;
extern int optind;
int c;
int ifile;
- int verbose = 0;
- int append = 0;
+ int verbose = 0, transpose = 0;
- while ((c = getopt(argc, argv, "hd:vo:aV")) != -1)
+ while ((c = getopt(argc, argv, "hd:vTo:V")) != -1)
switch (c) {
case 'h':
usage(stdout);
return EXIT_SUCCESS;
case 'V':
- printf("h5fromh4 " PACKAGE_VERSION " by Steven G. Johnson\n"
+ printf("h4fromh5 " PACKAGE_VERSION " by Steven G. Johnson\n"
COPYRIGHT);
return EXIT_SUCCESS;
case 'v':
verbose = 1;
break;
- case 'a':
- append = 1;
+ case 'T':
+ transpose = 1;
break;
case 'd':
free(data_name);
data_name = my_strdup(optarg);
break;
case 'o':
- free(h5_fname);
- h5_fname = split_fname(optarg, &dname);
- if (dname[0]) {
- free(data_name);
- data_name = dname;
- }
- break;
+ free(h4_fname);
+ h4_fname = my_strdup(optarg);
+ break;
default:
fprintf(stderr, "Invalid argument -%c\n", c);
usage(stderr);
@@ -96,56 +91,44 @@ int main(int argc, char **argv)
return EXIT_FAILURE;
}
+ if (h4_fname && optind + 1 < argc) {
+ fprintf(stderr, "h4fromh5: only one .h5 file can be used with -o\n");
+ return EXIT_FAILURE;
+ }
+
for (ifile = optind; ifile < argc; ++ifile) {
- char *h4_fname = argv[ifile];
+ char *h5_fname, *dname;
arrayh4 a4;
- int i, dims_copy[ARRAYH4_MAX_RANK];
- char *cur_h5_fname = h5_fname;
+ int i, err;
+ int32 dims_copy[ARRAYH4_MAX_RANK];
+ char *cur_h4_fname = h4_fname;
arrayh5 a;
- if (!cur_h5_fname)
- cur_h5_fname = replace_suffix(h4_fname, ".hdf", ".h5");
-
- /* If we specified -o (to concatenate several HDF4 files into
- a single HDF5 file) and if there is more than one filename
- argument, use the filename (minus ".hdf") as the dataset name. */
- if (h5_fname && optind + 1 < argc) {
- dname = my_strdup(h4_fname);
- /* remove ".hdf" from dataset name: */
- if (strlen(dname) >= strlen(".hdf") &&
- !strcmp(dname + strlen(dname)-strlen(".hdf"),
- ".hdf"))
- dname[strlen(dname) - strlen(".hdf")] = 0;
- }
- else {
- dname = data_name;
- if (!dname)
- dname = my_strdup("data");
- }
-
+ h5_fname = split_fname(argv[ifile], &dname);
+ if (!dname[0])
+ dname = data_name;
+
+ if (!cur_h4_fname)
+ cur_h4_fname = replace_suffix(h5_fname, ".h5", ".hdf");
+
if (verbose)
- printf("Reading HDF4 input file \"%s\"...\n", h4_fname);
- CHECK(arrayh4_read(h4_fname, &a4, 0), "error reading HDF4 file");
+ printf("Reading HDF5 input file \"%s\"...\n", h5_fname);
+ err = arrayh5_read(&a, h5_fname, dname, NULL, 0, 0, 0, 0);
+ CHECK(!err, arrayh5_read_strerror[err]);
- for (i = 0; i < a4.rank; ++i)
- dims_copy[i] = a4.dims[i];
+ if (transpose)
+ arrayh5_transpose(&a);
- a = arrayh5_create(a4.rank, dims_copy);
-
- if (a4.numtype == DFNT_FLOAT64) {
- for (i = 0; i < a4.N; ++i)
- a.data[i] = a4.p.d[i];
- }
- else if (a4.numtype == DFNT_FLOAT32) {
- for (i = 0; i < a4.N; ++i)
- a.data[i] = a4.p.f[i];
- }
- else {
- CHECK(0, "unknown HDF4 numeric type");
- }
+ CHECK(a.rank <= ARRAYH4_MAX_RANK, "HDF5 rank is too big");
+ for (i = 0; i < a.rank; ++i)
+ dims_copy[i] = a.dims[i];
- arrayh4_destroy(a4);
+ CHECK(arrayh4_create(&a4, DFNT_FLOAT64, a.rank, dims_copy),
+ "error allocating HDF4 data");
+ for (i = 0; i < a.N; ++i)
+ a4.p.d[i] = a.data[i];
+
if (verbose) {
double a_min, a_max;
arrayh5_getrange(a, &a_min, &a_max);
@@ -157,17 +140,17 @@ int main(int argc, char **argv)
printf("Writing size %d", a.dims[0]);
for (i = 1; i < a.rank; ++i)
printf("x%d", a.dims[i]);
- printf(" data to %s:%s\n", cur_h5_fname, dname);
+ printf(" data to %s\n", cur_h4_fname);
}
- arrayh5_write(a, cur_h5_fname, dname,
- append || (h5_fname && ifile > optind));
arrayh5_destroy(a);
- if (h5_fname != cur_h5_fname)
- free(cur_h5_fname);
- if (dname != data_name)
- free(dname);
+ arrayh4_write(cur_h4_fname, a4);
+ arrayh4_destroy(a4);
+
+ if (h4_fname != cur_h4_fname)
+ free(cur_h4_fname);
+ free(h5_fname);
}
return EXIT_SUCCESS;
diff --git a/h5fromh4.1 b/h5fromh4.1
index 44f910a..f67d0fa 100644
--- a/h5fromh4.1
+++ b/h5fromh4.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2004 Massachusetts Institute of Technology
+.\" Copyright (c) 2005 Massachusetts Institute of Technology
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
.\" a copy of this software and associated documentation files (the
@@ -93,5 +93,5 @@ option.
.SH BUGS
Send bug reports to S. G. Johnson, stevenj at alum.mit.edu.
.SH AUTHORS
-Written by Steven G. Johnson. Copyright (c) 2004 by the Massachusetts
+Written by Steven G. Johnson. Copyright (c) 2005 by the Massachusetts
Institute of Technology.
diff --git a/h5fromh4.c b/h5fromh4.c
index 744742e..4b932f5 100644
--- a/h5fromh4.c
+++ b/h5fromh4.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+/* Copyright (c) 2005 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff --git a/h5fromitxt.c b/h5fromitxt.c
index 57cd3f8..99abcbd 100644
--- a/h5fromitxt.c
+++ b/h5fromitxt.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+/* Copyright (c) 2005 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff --git a/h5fromtxt.1 b/h5fromtxt.1
index ee8decd..6dc17fd 100644
--- a/h5fromtxt.1
+++ b/h5fromtxt.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2004 Massachusetts Institute of Technology
+.\" Copyright (c) 2005 Massachusetts Institute of Technology
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
.\" a copy of this software and associated documentation files (the
@@ -109,5 +109,5 @@ Alternatively, use the syntax \fIHDF5FILE:DATASET\fR.
.SH BUGS
Send bug reports to S. G. Johnson, stevenj at alum.mit.edu.
.SH AUTHORS
-Written by Steven G. Johnson. Copyright (c) 2004 by the Massachusetts
+Written by Steven G. Johnson. Copyright (c) 2005 by the Massachusetts
Institute of Technology.
diff --git a/h5fromtxt.c b/h5fromtxt.c
index 225c7ca..5b0e372 100644
--- a/h5fromtxt.c
+++ b/h5fromtxt.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+/* Copyright (c) 2005 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff --git a/h5math.1 b/h5math.1
index ba79cf4..d86dc72 100644
--- a/h5math.1
+++ b/h5math.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2004 Massachusetts Institute of Technology
+.\" Copyright (c) 2005 Massachusetts Institute of Technology
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
.\" a copy of this software and associated documentation files (the
@@ -19,7 +19,7 @@
.\" TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
.\" SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
.\"
-.TH H5MATH 1 "May 23, 2004" "h5utils" "h5utils"
+.TH H5MATH 1 "May 23, 2005" "h5utils" "h5utils"
.SH NAME
h5math \- combine/create HDF5 files with math expressions
.SH SYNOPSIS
@@ -171,5 +171,5 @@ option).
.SH BUGS
Send bug reports to S. G. Johnson, stevenj at alum.mit.edu.
.SH AUTHORS
-Written by Steven G. Johnson. Copyright (c) 2004 by the Massachusetts
+Written by Steven G. Johnson. Copyright (c) 2005 by the Massachusetts
Institute of Technology.
diff --git a/h5math.c b/h5math.c
index 3f0d6bb..202ce67 100644
--- a/h5math.c
+++ b/h5math.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+/* Copyright (c) 2005 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff --git a/h5topng.c b/h5topng.c
index c66b5ef..e365fbf 100644
--- a/h5topng.c
+++ b/h5topng.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+/* Copyright (c) 2005 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff --git a/h5totxt.1 b/h5totxt.1
index 6b12958..990a74c 100644
--- a/h5totxt.1
+++ b/h5totxt.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2004 Massachusetts Institute of Technology
+.\" Copyright (c) 2005 Massachusetts Institute of Technology
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
.\" a copy of this software and associated documentation files (the
@@ -120,5 +120,5 @@ command (included with hdf5) to find the names of datasets within a file.
.SH BUGS
Send bug reports to S. G. Johnson, stevenj at alum.mit.edu.
.SH AUTHORS
-Written by Steven G. Johnson. Copyright (c) 2004 by the Massachusetts
+Written by Steven G. Johnson. Copyright (c) 2005 by the Massachusetts
Institute of Technology.
diff --git a/h5totxt.c b/h5totxt.c
index 73cab34..09693c2 100644
--- a/h5totxt.c
+++ b/h5totxt.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+/* Copyright (c) 2005 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff --git a/h5tov5d.1 b/h5tov5d.1
index 07bb950..13d30dd 100644
--- a/h5tov5d.1
+++ b/h5tov5d.1
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2004 Massachusetts Institute of Technology
+.\" Copyright (c) 2005 Massachusetts Institute of Technology
.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
.\" a copy of this software and associated documentation files (the
@@ -133,5 +133,5 @@ command (included with hdf5) to find the names of datasets within a file.
.SH BUGS
Send bug reports to S. G. Johnson, stevenj at alum.mit.edu.
.SH AUTHORS
-Written by Steven G. Johnson. Copyright (c) 2004 by the Massachusetts
+Written by Steven G. Johnson. Copyright (c) 2005 by the Massachusetts
Institute of Technology.
diff --git a/h5tov5d.c b/h5tov5d.c
index c041045..3091b9e 100644
--- a/h5tov5d.c
+++ b/h5tov5d.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+/* Copyright (c) 2005 Massachusetts Institute of Technology
*
* [ IMPORTANT: Note that the following is DIFFERENT from the license
* for the rest of the h5utils package. ]
@@ -306,7 +306,7 @@ int main(int argc, char **argv)
return EXIT_SUCCESS;
case 'V':
printf("h5tov5d " PACKAGE_VERSION " by Steven G. Johnson\n"
- "Copyright (c) 2004 Massachusetts Institute of Technology\n"
+ "Copyright (c) 2005 Massachusetts Institute of Technology\n"
"\n"
"This program is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License as published by\n"
diff --git a/h5tovtk.1 b/h5tovtk.1
index e585375..5159458 100644
--- a/h5tovtk.1
+++ b/h5tovtk.1
@@ -180,5 +180,5 @@ command (included with hdf5) to find the names of datasets within a file.
.SH BUGS
Send bug reports to S. G. Johnson, stevenj at alum.mit.edu.
.SH AUTHORS
-Written by Steven G. Johnson. Copyright (c) 2004 by the Massachusetts
+Written by Steven G. Johnson. Copyright (c) 2005 by the Massachusetts
Institute of Technology.
diff --git a/h5tovtk.c b/h5tovtk.c
index 5679d1c..a083f18 100644
--- a/h5tovtk.c
+++ b/h5tovtk.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+/* Copyright (c) 2005 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff --git a/h5utils.c b/h5utils.c
index 99f0a08..505bf97 100644
--- a/h5utils.c
+++ b/h5utils.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+/* Copyright (c) 2005 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
diff --git a/install-sh b/install-sh
index e4160c9..1a83534 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2004-04-01.17
+scriptversion=2005-02-02.21
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -58,9 +58,6 @@ stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
-transformbasename=
-transform_arg=
-instcmd="$mvprog"
chmodcmd="$chmodprog 0755"
chowncmd=
chgrpcmd=
@@ -70,23 +67,27 @@ mvcmd="$mvprog"
src=
dst=
dir_arg=
+dstarg=
+no_target_directory=
-usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
- or: $0 -d DIRECTORIES...
+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+ or: $0 [OPTION]... -d DIRECTORIES...
-In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
-In the second, create the directory path DIR.
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
Options:
--b=TRANSFORMBASENAME
--c copy source (using $cpprog) instead of moving (using $mvprog).
+-c (ignored)
-d create directories instead of installing files.
--g GROUP $chgrp installed files to GROUP.
--m MODE $chmod installed files to MODE.
--o USER $chown installed files to USER.
--s strip installed files (using $stripprog).
--t=TRANSFORM
+-g GROUP $chgrpprog installed files to GROUP.
+-m MODE $chmodprog installed files to MODE.
+-o USER $chownprog installed files to USER.
+-s $stripprog installed files.
+-t DIRECTORY install into DIRECTORY.
+-T report an error if DSTFILE is a directory.
--help display this help and exit.
--version display version info and exit.
@@ -96,12 +97,7 @@ Environment variables override the default commands:
while test -n "$1"; do
case $1 in
- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
- shift
- continue;;
-
- -c) instcmd=$cpprog
- shift
+ -c) shift
continue;;
-d) dir_arg=true
@@ -113,7 +109,7 @@ while test -n "$1"; do
shift
continue;;
- --help) echo "$usage"; exit 0;;
+ --help) echo "$usage"; exit $?;;
-m) chmodcmd="$chmodprog $2"
shift
@@ -129,14 +125,20 @@ while test -n "$1"; do
shift
continue;;
- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
- shift
- continue;;
+ -t) dstarg=$2
+ shift
+ shift
+ continue;;
- --version) echo "$0 $scriptversion"; exit 0;;
+ -T) no_target_directory=true
+ shift
+ continue;;
+
+ --version) echo "$0 $scriptversion"; exit $?;;
*) # When -d is used, all remaining arguments are directories to create.
- test -n "$dir_arg" && break
+ # When -t is used, the destination is already specified.
+ test -n "$dir_arg$dstarg" && break
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
@@ -174,13 +176,13 @@ do
src=
if test -d "$dst"; then
- instcmd=:
+ mkdircmd=:
chmodcmd=
else
- instcmd=$mkdirprog
+ mkdircmd=$mkdirprog
fi
else
- # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
if test ! -f "$src" && test ! -d "$src"; then
@@ -202,12 +204,16 @@ do
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
+ if test -n "$no_target_directory"; then
+ echo "$0: $dstarg: Is a directory" >&2
+ exit 1
+ fi
dst=$dst/`basename "$src"`
fi
fi
# This sed command emulates the dirname command.
- dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
# Make sure that the destination directory exists.
@@ -220,7 +226,8 @@ do
oIFS=$IFS
# Some sh's can't handle IFS=/ for some reason.
IFS='%'
- set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+ shift
IFS=$oIFS
pathcomp=
@@ -229,51 +236,42 @@ do
pathcomp=$pathcomp$1
shift
if test ! -d "$pathcomp"; then
- $mkdirprog "$pathcomp" || lasterr=$?
+ $mkdirprog "$pathcomp"
# mkdir can fail with a `File exist' error in case several
# install-sh are creating the directory concurrently. This
# is OK.
- test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; }
+ test -d "$pathcomp" || exit
fi
pathcomp=$pathcomp/
done
fi
if test -n "$dir_arg"; then
- $doit $instcmd "$dst" \
+ $doit $mkdircmd "$dst" \
&& { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
&& { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
&& { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
else
- # If we're going to rename the final executable, determine the name now.
- if test -z "$transformarg"; then
- dstfile=`basename "$dst"`
- else
- dstfile=`basename "$dst" $transformbasename \
- | sed $transformarg`$transformbasename
- fi
-
- # don't allow the sed command to completely eliminate the filename.
- test -z "$dstfile" && dstfile=`basename "$dst"`
+ dstfile=`basename "$dst"`
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
rmtmp=$dstdir/_rm.$$_
# Trap to clean up those temp files at exit.
- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
trap '(exit $?); exit' 1 2 13 15
- # Move or copy the file name to the temp name
- $doit $instcmd "$src" "$dsttmp" &&
+ # Copy the file name to the temp name.
+ $doit $cpprog "$src" "$dsttmp" &&
# and set any options; do chmod last to preserve setuid bits.
#
# If any of these fail, we abort the whole thing. If we want to
# ignore errors from any of these, just make sure not to ignore
- # errors from the above "$doit $instcmd $src $dsttmp" command.
+ # errors from the above "$doit $cpprog $src $dsttmp" command.
#
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
@@ -298,7 +296,7 @@ do
|| $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
|| {
echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
- (exit 1); exit
+ (exit 1); exit 1
}
else
:
@@ -309,12 +307,12 @@ do
$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
}
}
- fi || { (exit 1); exit; }
+ fi || { (exit 1); exit 1; }
done
# The final little trick to "correctly" pass the exit status to the exit trap.
{
- (exit 0); exit
+ (exit 0); exit 0
}
# Local variables:
diff --git a/missing b/missing
index e7ef83a..09edd88 100755
--- a/missing
+++ b/missing
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2003-09-02.23
+scriptversion=2005-02-08.22
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
@@ -60,11 +60,6 @@ case "$1" in
msg="probably too old"
fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -92,10 +87,12 @@ Supported PROGRAM values:
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Send bug reports to <bug-automake at gnu.org>."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -104,12 +101,42 @@ Send bug reports to <bug-automake at gnu.org>."
exit 1
;;
- aclocal*)
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case "$1" in
+ lex|yacc)
+ # 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
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" 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
@@ -119,11 +146,6 @@ WARNING: \`$1' is $msg. You should only need it if
;;
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -133,11 +155,6 @@ WARNING: \`$1' is $msg. You should only need it if
;;
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -157,11 +174,6 @@ WARNING: \`$1' is $msg. You should only need it if
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
@@ -173,11 +185,6 @@ WARNING: \`$1' is $msg. You should only need it if
;;
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -254,11 +261,6 @@ WARNING: \`$1' is $msg. You should only need it if
;;
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -279,11 +281,6 @@ WARNING: \`$1' is $msg. You should only need it if
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -291,20 +288,20 @@ WARNING: \`$1' is $msg. You should only need it if
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
touch $file
;;
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
diff --git a/mkinstalldirs b/mkinstalldirs
deleted file mode 100755
index 6fbe5e1..0000000
--- a/mkinstalldirs
+++ /dev/null
@@ -1,150 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2004-02-15.20
-
-# Original author: Noah Friedman <friedman at prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake at gnu.org> or send patches to
-# <automake-patches at gnu.org>.
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake at gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
- case $1 in
- -h | --help | --h*) # -h for help
- echo "$usage"
- exit 0
- ;;
- -m) # -m PERM arg
- shift
- test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
- dirmode=$1
- shift
- ;;
- --version)
- echo "$0 $scriptversion"
- exit 0
- ;;
- --) # stop option processing
- shift
- break
- ;;
- -*) # unknown option
- echo "$usage" 1>&2
- exit 1
- ;;
- *) # first non-opt arg
- break
- ;;
- esac
-done
-
-for file
-do
- if test -d "$file"; then
- shift
- else
- break
- fi
-done
-
-case $# in
- 0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error. This is a problem when calling mkinstalldirs
-# from a parallel make. We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
- '')
- if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
- else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- test -d ./-p && rmdir ./-p
- test -d ./--version && rmdir ./--version
- fi
- ;;
- *)
- if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
- test ! -d ./--version; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
- else
- # Clean up after NextStep and OpenStep mkdir.
- for d in ./-m ./-p ./--version "./$dirmode";
- do
- test -d $d && rmdir $d
- done
- fi
- ;;
-esac
-
-for file
-do
- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
- shift
-
- pathcomp=
- for d
- do
- pathcomp="$pathcomp$d"
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- else
- if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
- lasterr=""
- chmod "$dirmode" "$pathcomp" || lasterr=$?
-
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
- fi
- fi
- fi
-
- pathcomp="$pathcomp/"
- done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/writepng.c b/writepng.c
index 617c3ca..73ff0a2 100644
--- a/writepng.c
+++ b/writepng.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004 Massachusetts Institute of Technology
+/* Copyright (c) 2005 Massachusetts Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/h5utils.git
More information about the Pkg-grass-devel
mailing list