[DebianGIS-dev] r2812 - in packages/h5utils/trunk/debian: . patches
frankie at alioth.debian.org
frankie at alioth.debian.org
Sun Apr 4 18:48:38 UTC 2010
Author: frankie
Date: 2010-04-04 18:48:12 +0000 (Sun, 04 Apr 2010)
New Revision: 2812
Removed:
packages/h5utils/trunk/debian/patches/octave.diff
Modified:
packages/h5utils/trunk/debian/changelog
packages/h5utils/trunk/debian/control
packages/h5utils/trunk/debian/patches/series
packages/h5utils/trunk/debian/rules
Log:
New upstream release.
Modified: packages/h5utils/trunk/debian/changelog
===================================================================
--- packages/h5utils/trunk/debian/changelog 2010-04-04 06:11:40 UTC (rev 2811)
+++ packages/h5utils/trunk/debian/changelog 2010-04-04 18:48:12 UTC (rev 2812)
@@ -1,3 +1,14 @@
+h5utils (1.12.1-1) unstable; urgency=low
+
+ * New upstream release with better Octave autodetection.
+ * Dropped octave.diff patch.
+ * Ack of previous NMU with merge of moving to Octave 3.2 support.
+ (closes: #574020)
+ * Policy bumped to 3.8.4, no changes required.
+ * Fixed LFS support detection for HDF5 in debian/rules.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Sun, 04 Apr 2010 20:07:33 +0200
+
h5utils (1.12-2) unstable; urgency=low
* Changed build-dep in libhdf4-dev instead of libhdf4g-dev.
Modified: packages/h5utils/trunk/debian/control
===================================================================
--- packages/h5utils/trunk/debian/control 2010-04-04 06:11:40 UTC (rev 2811)
+++ packages/h5utils/trunk/debian/control 2010-04-04 18:48:12 UTC (rev 2812)
@@ -4,8 +4,8 @@
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
Build-Depends: debhelper (>= 7), libhdf5-serial-dev (>= 1.8.3), libz-dev, libpng-dev, hdf5-tools,
- libhdf4-dev, libmatheval1-dev, octave3.0-headers, quilt
-Standards-Version: 3.8.2
+ libhdf4-dev, libmatheval1-dev, octave3.2-headers, quilt
+Standards-Version: 3.8.4
Homepage: http://ab-initio.mit.edu/h5utils/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/h5utils/trunk/
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/h5utils/trunk
Deleted: packages/h5utils/trunk/debian/patches/octave.diff
===================================================================
--- packages/h5utils/trunk/debian/patches/octave.diff 2010-04-04 06:11:40 UTC (rev 2811)
+++ packages/h5utils/trunk/debian/patches/octave.diff 2010-04-04 18:48:12 UTC (rev 2812)
@@ -1,2413 +0,0 @@
-diff -urN h5utils-1.12-orig/aclocal.m4 h5utils-1.12/aclocal.m4
---- h5utils-1.12-orig/aclocal.m4 2009-06-12 23:23:43.000000000 +0200
-+++ h5utils-1.12/aclocal.m4 2009-06-24 15:20:03.000000000 +0200
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.11 -*- Autoconf -*-
-+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-+# 2005, 2006, 2007, 2008 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.
-@@ -31,10 +31,10 @@
- # generated from the m4 files accompanying Automake X.Y.
- # (This private macro should not be called outside this file.)
- AC_DEFUN([AM_AUTOMAKE_VERSION],
--[am__api_version='1.11'
-+[am__api_version='1.10'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.11], [],
-+m4_if([$1], [1.10.2], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -50,7 +50,7 @@
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.11])dnl
-+[AM_AUTOMAKE_VERSION([1.10.2])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-@@ -110,14 +110,14 @@
-
- # AM_CONDITIONAL -*- Autoconf -*-
-
--# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
- # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 9
-+# serial 8
-
- # AM_CONDITIONAL(NAME, SHELL-CONDITION)
- # -------------------------------------
-@@ -130,7 +130,6 @@
- AC_SUBST([$1_FALSE])dnl
- _AM_SUBST_NOTMAKE([$1_TRUE])dnl
- _AM_SUBST_NOTMAKE([$1_FALSE])dnl
--m4_define([_AM_COND_VALUE_$1], [$2])dnl
- if $2; then
- $1_TRUE=
- $1_FALSE='#'
-@@ -144,14 +143,14 @@
- Usually this means the macro was only invoked conditionally.]])
- fi])])
-
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 10
-+# serial 9
-
- # 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,
-@@ -208,16 +207,6 @@
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
- fi
-- am__universal=false
-- m4_case([$1], [CC],
-- [case " $depcc " in #(
-- *\ -arch\ *\ -arch\ *) am__universal=true ;;
-- esac],
-- [CXX],
-- [case " $depcc " in #(
-- *\ -arch\ *\ -arch\ *) am__universal=true ;;
-- esac])
--
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
-@@ -235,17 +224,7 @@
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-- # We check with `-c' and `-o' for the sake of the "dashmstdout"
-- # mode. It turns out that the SunPro C++ compiler does not properly
-- # handle `-M -o', and we need to detect this. Also, some Intel
-- # versions had trouble with output in subdirs
-- am__obj=sub/conftest.${OBJEXT-o}
-- am__minus_obj="-o $am__obj"
- case $depmode in
-- gcc)
-- # This depmode causes a compiler race in universal mode.
-- test "$am__universal" = false || continue
-- ;;
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
-@@ -255,23 +234,19 @@
- break
- fi
- ;;
-- msvisualcpp | msvcmsys)
-- # This compiler won't grok `-c -o', but also, the minuso test has
-- # not run yet. These depmodes are late enough in the game, and
-- # so weak that their functioning should not be impacted.
-- am__obj=conftest.${OBJEXT-o}
-- am__minus_obj=
-- ;;
- none) break ;;
- esac
-+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+ # mode. It turns out that the SunPro C++ compiler does not properly
-+ # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
-- source=sub/conftest.c object=$am__obj \
-+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
-@@ -335,61 +310,59 @@
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--#serial 5
-+#serial 4
-
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[{
-- # Autoconf 2.62 quotes --file arguments for eval, but not when files
-- # are listed without --file. Let's play safe and only enable the eval
-- # if we detect the quoting.
-- case $CONFIG_FILES in
-- *\'*) eval set x "$CONFIG_FILES" ;;
-- *) set x $CONFIG_FILES ;;
-- esac
-- shift
-- for mf
-- do
-- # Strip MF so we end up with the name of the file.
-- mf=`echo "$mf" | sed -e 's/:.*$//'`
-- # Check whether this is an Automake generated Makefile or not.
-- # We used to match only the files named `Makefile.in', but
-- # some people rename them; so instead we look at the file content.
-- # Grep'ing the first line is not enough: some people post-process
-- # each Makefile.in and add a new line on top of each file to say so.
-- # Grep'ing the whole file is not good either: AIX grep has a line
-- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-- dirpart=`AS_DIRNAME("$mf")`
-- else
-- continue
-- fi
-- # 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"`
-- # 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
-- fdir=`AS_DIRNAME(["$file"])`
-- AS_MKDIR_P([$dirpart/$fdir])
-- # echo "creating $dirpart/$file"
-- echo '# dummy' > "$dirpart/$file"
-- done
-+[# Autoconf 2.62 quotes --file arguments for eval, but not when files
-+# are listed without --file. Let's play safe and only enable the eval
-+# if we detect the quoting.
-+case $CONFIG_FILES in
-+*\'*) eval set x "$CONFIG_FILES" ;;
-+*) set x $CONFIG_FILES ;;
-+esac
-+shift
-+for mf
-+do
-+ # Strip MF so we end up with the name of the file.
-+ mf=`echo "$mf" | sed -e 's/:.*$//'`
-+ # Check whether this is an Automake generated Makefile or not.
-+ # We used to match only the files named `Makefile.in', but
-+ # some people rename them; so instead we look at the file content.
-+ # Grep'ing the first line is not enough: some people post-process
-+ # each Makefile.in and add a new line on top of each file to say so.
-+ # Grep'ing the whole file is not good either: AIX grep has a line
-+ # limit of 2048, but all sed's we know have understand at least 4000.
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+ dirpart=`AS_DIRNAME("$mf")`
-+ else
-+ continue
-+ fi
-+ # 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"`
-+ # 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
-+ fdir=`AS_DIRNAME(["$file"])`
-+ AS_MKDIR_P([$dirpart/$fdir])
-+ # echo "creating $dirpart/$file"
-+ echo '# dummy' > "$dirpart/$file"
- done
--}
-+done
- ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-@@ -421,13 +394,13 @@
- # Do all the work for Automake. -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-+# 2005, 2006, 2008 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 16
-+# serial 13
-
- # 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.
-@@ -444,7 +417,7 @@
- # arguments mandatory, and then we can depend on a new Autoconf
- # release and drop the old call support.
- AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_PREREQ([2.62])dnl
-+[AC_PREREQ([2.60])dnl
- dnl Autoconf wants to disallow AM_ names. We explicitly allow
- dnl the ones we care about.
- m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-@@ -495,8 +468,8 @@
- AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
- AM_MISSING_PROG(AUTOHEADER, autoheader)
- AM_MISSING_PROG(MAKEINFO, makeinfo)
--AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
--AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-+AM_PROG_INSTALL_SH
-+AM_PROG_INSTALL_STRIP
- AC_REQUIRE([AM_PROG_MKDIR_P])dnl
- # We need awk for the "check" target. The system "awk" is bad on
- # some platforms.
-@@ -504,37 +477,24 @@
- 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([tar-pax], [_AM_PROG_TAR([pax])],
-+ [_AM_PROG_TAR([v7])])])
- _AM_IF_OPTION([no-dependencies],,
- [AC_PROVIDE_IFELSE([AC_PROG_CC],
-- [_AM_DEPENDENCIES(CC)],
-- [define([AC_PROG_CC],
-- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+ [_AM_DEPENDENCIES(CC)],
-+ [define([AC_PROG_CC],
-+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
- AC_PROVIDE_IFELSE([AC_PROG_CXX],
-- [_AM_DEPENDENCIES(CXX)],
-- [define([AC_PROG_CXX],
-- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+ [_AM_DEPENDENCIES(CXX)],
-+ [define([AC_PROG_CXX],
-+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
- AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-- [_AM_DEPENDENCIES(OBJC)],
-- [define([AC_PROG_OBJC],
-- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-+ [_AM_DEPENDENCIES(OBJC)],
-+ [define([AC_PROG_OBJC],
-+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
- ])
--_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
--dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
--dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
--dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
--AC_CONFIG_COMMANDS_PRE(dnl
--[m4_provide_if([_AM_COMPILER_EXEEXT],
-- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
- ])
-
--dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
--dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
--dnl mangled by Autoconf and run in a shell conditional statement.
--m4_define([_AC_COMPILER_EXEEXT],
--m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
--
-
- # When config.status generates a header, we must update the stamp-h file.
- # This file resides in the same directory as the config header
-@@ -557,7 +517,7 @@
- done
- echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
--# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
-+# 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,
-@@ -568,14 +528,7 @@
- # Define $install_sh.
- AC_DEFUN([AM_PROG_INSTALL_SH],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--if test x"${install_sh}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-- *)
-- install_sh="\${SHELL} $am_aux_dir/install-sh"
-- esac
--fi
-+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
- AC_SUBST(install_sh)])
-
- # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-@@ -602,38 +555,27 @@
- # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
- # From Jim Meyering
-
--# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-+# 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.
-
--# serial 5
-+# serial 4
-
--# AM_MAINTAINER_MODE([DEFAULT-MODE])
--# ----------------------------------
--# Control maintainer-specific portions of Makefiles.
--# Default is to disable them, unless `enable' is passed literally.
--# For symmetry, `disable' may be passed as well. Anyway, the user
--# can override the default with the --enable/--disable switch.
- AC_DEFUN([AM_MAINTAINER_MODE],
--[m4_case(m4_default([$1], [disable]),
-- [enable], [m4_define([am_maintainer_other], [disable])],
-- [disable], [m4_define([am_maintainer_other], [enable])],
-- [m4_define([am_maintainer_other], [enable])
-- m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
--AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
-- dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-- AC_ARG_ENABLE([maintainer-mode],
--[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+ dnl maintainer-mode is disabled by default
-+ AC_ARG_ENABLE(maintainer-mode,
-+[ --enable-maintainer-mode enable make rules and dependencies not useful
- (and sometimes confusing) to the casual installer],
-- [USE_MAINTAINER_MODE=$enableval],
-- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-+ USE_MAINTAINER_MODE=$enableval,
-+ USE_MAINTAINER_MODE=no)
- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-+ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
- MAINT=$MAINTAINER_MODE_TRUE
-- AC_SUBST([MAINT])dnl
-+ AC_SUBST(MAINT)dnl
- ]
- )
-
-@@ -641,13 +583,13 @@
-
- # Check to see how 'make' treats includes. -*- Autoconf -*-
-
--# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
-+# 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 4
-+# serial 3
-
- # AM_MAKE_INCLUDE()
- # -----------------
-@@ -656,7 +598,7 @@
- [am_make=${MAKE-make}
- cat > confinc << 'END'
- am__doit:
-- @echo this is the am__doit target
-+ @echo done
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
-@@ -666,24 +608,24 @@
- _am_result=none
- # First try GNU make style include.
- echo "include confinc" > confmf
--# Ignore all kinds of additional output from `make'.
--case `$am_make -s -f confmf 2> /dev/null` in #(
--*the\ am__doit\ target*)
-- am__include=include
-- am__quote=
-- _am_result=GNU
-- ;;
--esac
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+ am__include=include
-+ am__quote=
-+ _am_result=GNU
-+fi
- # Now try BSD make style include.
- if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
-- case `$am_make -s -f confmf 2> /dev/null` in #(
-- *the\ am__doit\ target*)
-- am__include=.include
-- am__quote="\""
-- _am_result=BSD
-- ;;
-- esac
-+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+ am__include=.include
-+ am__quote="\""
-+ _am_result=BSD
-+ fi
- fi
- AC_SUBST([am__include])
- AC_SUBST([am__quote])
-@@ -728,14 +670,14 @@
-
- # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-
--# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-+# Copyright (C) 1997, 1999, 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 5
-
- # AM_MISSING_PROG(NAME, PROGRAM)
- # ------------------------------
-@@ -752,14 +694,7 @@
- AC_DEFUN([AM_MISSING_HAS_RUN],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- AC_REQUIRE_AUX_FILE([missing])dnl
--if test x"${MISSING+set}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-- *)
-- MISSING="\${SHELL} $am_aux_dir/missing" ;;
-- esac
--fi
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
- # Use eval to expand $SHELL
- if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-@@ -830,14 +765,14 @@
-
- # Check to make sure that the build environment is sane. -*- Autoconf -*-
-
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-+# 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 5
-+# serial 4
-
- # AM_SANITY_CHECK
- # ---------------
-@@ -846,29 +781,16 @@
- # Just in case
- sleep 1
- echo timestamp > conftest.file
--# Reject unsafe characters in $srcdir or the absolute working directory
--# name. Accept space and tab only in the latter.
--am_lf='
--'
--case `pwd` in
-- *[[\\\"\#\$\&\'\`$am_lf]]*)
-- AC_MSG_ERROR([unsafe absolute working directory name]);;
--esac
--case $srcdir in
-- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
-- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
--esac
--
- # Do `set' in a subshell so we don't clobber the current shell's
- # arguments. Must try -L first in case configure is actually a
- # symlink; some systems play weird games with the mod time of symlinks
- # (eg FreeBSD returns the mod time of the symlink's containing
- # directory).
- if (
-- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
-- set X `ls -t "$srcdir/configure" conftest.file`
-+ set X `ls -t $srcdir/configure conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
-@@ -921,25 +843,18 @@
- INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
- AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
--# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
-+# Copyright (C) 2006 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_SUBST_NOTMAKE(VARIABLE)
- # ---------------------------
- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
- # This macro is traced by Automake.
- AC_DEFUN([_AM_SUBST_NOTMAKE])
-
--# AM_SUBST_NOTMAKE(VARIABLE)
--# ---------------------------
--# Public sister of _AM_SUBST_NOTMAKE.
--AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
--
- # Check how to create a tarball. -*- Autoconf -*-
-
- # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-diff -urN h5utils-1.12-orig/compile h5utils-1.12/compile
---- h5utils-1.12-orig/compile 2009-05-19 17:38:16.000000000 +0200
-+++ h5utils-1.12/compile 2009-06-24 15:20:12.000000000 +0200
-@@ -1,10 +1,9 @@
- #! /bin/sh
- # Wrapper for compilers which do not understand `-c -o'.
-
--scriptversion=2009-04-28.21; # UTC
-+scriptversion=2005-05-14.22
-
--# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 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
-@@ -18,7 +17,8 @@
- # GNU General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
--# along with this program. If not, see <http://www.gnu.org/licenses/>.
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -103,13 +103,13 @@
- fi
-
- # Name of file we expect compiler to create.
--cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; 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
-+# 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
- break
-@@ -138,6 +138,5 @@
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
- # time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-time-zone: "UTC"
--# time-stamp-end: "; # UTC"
-+# time-stamp-end: "$"
- # End:
-diff -urN h5utils-1.12-orig/config.h.in~ h5utils-1.12/config.h.in~
---- h5utils-1.12-orig/config.h.in~ 1970-01-01 01:00:00.000000000 +0100
-+++ h5utils-1.12/config.h.in~ 2009-06-12 23:23:47.000000000 +0200
-@@ -0,0 +1,113 @@
-+/* config.h.in. Generated from configure.ac by autoheader. */
-+
-+/* Define if building universal (internal helper macro) */
-+#undef AC_APPLE_UNIVERSAL_BUILD
-+
-+/* datadir installation prefix */
-+#undef DATADIR
-+
-+/* Define to 1 if you have the <arpa/inet.h> header file. */
-+#undef HAVE_ARPA_INET_H
-+
-+/* Define to 1 if you have the <hdf.h> header file. */
-+#undef HAVE_HDF_H
-+
-+/* Define to 1 if you have the <hdf/hdf.h> header file. */
-+#undef HAVE_HDF_HDF_H
-+
-+/* Define if you have htonl. */
-+#undef HAVE_HTONL
-+
-+/* Define if you have htons. */
-+#undef HAVE_HTONS
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H
-+
-+/* Define to 1 if you have the `m' library (-lm). */
-+#undef HAVE_LIBM
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* Define to 1 if you have the <netinet/in.h> header file. */
-+#undef HAVE_NETINET_IN_H
-+
-+/* Define to 1 if you have the `snprintf' function. */
-+#undef HAVE_SNPRINTF
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H
-+
-+/* Define to 1 if the system has the type `uint16_t'. */
-+#undef HAVE_UINT16_T
-+
-+/* Define to 1 if the system has the type `uint32_t'. */
-+#undef HAVE_UINT32_T
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H
-+
-+/* Define to 1 if you have the <vis5d/v5d.h> header file. */
-+#undef HAVE_VIS5D_V5D_H
-+
-+/* [Define], [if], [you], [have], [the], [<vis5d+/v5d.h>], [header], [file.]
-+ */
-+#undef HAVE_VIS5Dp_V5D_H
-+
-+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-+#undef NO_MINUS_C_MINUS_O
-+
-+/* Name of package */
-+#undef PACKAGE
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT
-+
-+/* Define to the full name of this package. */
-+#undef PACKAGE_NAME
-+
-+/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING
-+
-+/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME
-+
-+/* Define to the version of this package. */
-+#undef PACKAGE_VERSION
-+
-+/* The size of `float', as computed by sizeof. */
-+#undef SIZEOF_FLOAT
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS
-+
-+/* Version number of package */
-+#undef VERSION
-+
-+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-+ significant byte first (like Motorola and SPARC, unlike Intel). */
-+#if defined AC_APPLE_UNIVERSAL_BUILD
-+# if defined __BIG_ENDIAN__
-+# define WORDS_BIGENDIAN 1
-+# endif
-+#else
-+# ifndef WORDS_BIGENDIAN
-+# undef WORDS_BIGENDIAN
-+# endif
-+#endif
-diff -urN h5utils-1.12-orig/configure h5utils-1.12/configure
---- h5utils-1.12-orig/configure 2009-06-12 23:23:44.000000000 +0200
-+++ h5utils-1.12/configure 2009-06-24 15:20:08.000000000 +0200
-@@ -637,9 +637,7 @@
- # include <unistd.h>
- #endif"
-
--ac_subst_vars='am__EXEEXT_FALSE
--am__EXEEXT_TRUE
--LTLIBOBJS
-+ac_subst_vars='LTLIBOBJS
- LIBOBJS
- MORE_H5UTILS_MANS
- MORE_H5UTILS
-@@ -1852,7 +1850,7 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--am__api_version='1.11'
-+am__api_version='1.10'
-
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-@@ -1983,33 +1981,16 @@
- # Just in case
- sleep 1
- echo timestamp > conftest.file
--# Reject unsafe characters in $srcdir or the absolute working directory
--# name. Accept space and tab only in the latter.
--am_lf='
--'
--case `pwd` in
-- *[\\\"\#\$\&\'\`$am_lf]*)
-- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
--$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
-- { (exit 1); exit 1; }; };;
--esac
--case $srcdir in
-- *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
-- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
--$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
-- { (exit 1); exit 1; }; };;
--esac
--
- # Do `set' in a subshell so we don't clobber the current shell's
- # arguments. Must try -L first in case configure is actually a
- # symlink; some systems play weird games with the mod time of symlinks
- # (eg FreeBSD returns the mod time of the symlink's containing
- # directory).
- if (
-- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
-- set X `ls -t "$srcdir/configure" conftest.file`
-+ set X `ls -t $srcdir/configure conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
-@@ -2053,14 +2034,7 @@
- # expand $ac_aux_dir to an absolute path
- am_aux_dir=`cd $ac_aux_dir && pwd`
-
--if test x"${MISSING+set}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-- *)
-- MISSING="\${SHELL} $am_aux_dir/missing" ;;
-- esac
--fi
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
- # Use eval to expand $SHELL
- if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
-@@ -2070,115 +2044,6 @@
- $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
-
--if test x"${install_sh}" != xset; then
-- case $am_aux_dir in
-- *\ * | *\ *)
-- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-- *)
-- install_sh="\${SHELL} $am_aux_dir/install-sh"
-- esac
--fi
--
--# Installed binaries are usually stripped using `strip' when the user
--# run `make install-strip'. However `strip' might not be the right
--# tool to use in cross-compilation environments, therefore Automake
--# will honor the `STRIP' environment variable to overrule this program.
--if test "$cross_compiling" != no; then
-- if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
--set dummy ${ac_tool_prefix}strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_STRIP+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- if test -n "$STRIP"; then
-- ac_cv_prog_STRIP="$STRIP" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
--fi
--fi
--STRIP=$ac_cv_prog_STRIP
--if test -n "$STRIP"; then
-- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
--$as_echo "$STRIP" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--fi
--if test -z "$ac_cv_prog_STRIP"; then
-- ac_ct_STRIP=$STRIP
-- # Extract the first word of "strip", so it can be a program name with args.
--set dummy strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- if test -n "$ac_ct_STRIP"; then
-- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_STRIP="strip"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--IFS=$as_save_IFS
--
--fi
--fi
--ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
--if test -n "$ac_ct_STRIP"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--$as_echo "$ac_ct_STRIP" >&6; }
--else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
-- if test "x$ac_ct_STRIP" = x; then
-- STRIP=":"
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
--ac_tool_warned=yes ;;
--esac
-- STRIP=$ac_ct_STRIP
-- fi
--else
-- STRIP="$ac_cv_prog_STRIP"
--fi
--
--fi
--INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
--
- { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
- $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
- if test -z "$MKDIR_P"; then
-@@ -2361,6 +2226,108 @@
-
- MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-+
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'. However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+if test "$cross_compiling" != no; then
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}strip; ac_word=$2
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_STRIP+set}" = set; then
-+ $as_echo_n "(cached) " >&6
-+else
-+ if test -n "$STRIP"; then
-+ ac_cv_prog_STRIP="$STRIP" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
-+ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-+$as_echo "$STRIP" >&6; }
-+else
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_STRIP"; then
-+ ac_ct_STRIP=$STRIP
-+ # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-+ $as_echo_n "(cached) " >&6
-+else
-+ if test -n "$ac_ct_STRIP"; then
-+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_ac_ct_STRIP="strip"
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+$as_echo "$ac_ct_STRIP" >&6; }
-+else
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+ if test "x$ac_ct_STRIP" = x; then
-+ STRIP=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ STRIP=$ac_ct_STRIP
-+ fi
-+else
-+ STRIP="$ac_cv_prog_STRIP"
-+fi
-+
-+fi
-+INSTALL_STRIP_PROGRAM="\$(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.
-@@ -2376,7 +2343,6 @@
-
- ac_config_headers="$ac_config_headers config.h"
-
--
- { $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
- $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
- # Check whether --enable-maintainer-mode was given.
-@@ -3341,7 +3307,7 @@
- am_make=${MAKE-make}
- cat > confinc << 'END'
- am__doit:
-- @echo this is the am__doit target
-+ @echo done
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
-@@ -3352,24 +3318,24 @@
- _am_result=none
- # First try GNU make style include.
- echo "include confinc" > confmf
--# Ignore all kinds of additional output from `make'.
--case `$am_make -s -f confmf 2> /dev/null` in #(
--*the\ am__doit\ target*)
-- am__include=include
-- am__quote=
-- _am_result=GNU
-- ;;
--esac
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+ am__include=include
-+ am__quote=
-+ _am_result=GNU
-+fi
- # Now try BSD make style include.
- if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
-- case `$am_make -s -f confmf 2> /dev/null` in #(
-- *the\ am__doit\ target*)
-- am__include=.include
-- am__quote="\""
-- _am_result=BSD
-- ;;
-- esac
-+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+ am__include=.include
-+ am__quote="\""
-+ _am_result=BSD
-+ fi
- fi
-
-
-@@ -3426,11 +3392,6 @@
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
-- am__universal=false
-- case " $depcc " in #(
-- *\ -arch\ *\ -arch\ *) am__universal=true ;;
-- esac
--
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
-@@ -3448,17 +3409,7 @@
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-- # We check with `-c' and `-o' for the sake of the "dashmstdout"
-- # mode. It turns out that the SunPro C++ compiler does not properly
-- # handle `-M -o', and we need to detect this. Also, some Intel
-- # versions had trouble with output in subdirs
-- am__obj=sub/conftest.${OBJEXT-o}
-- am__minus_obj="-o $am__obj"
- case $depmode in
-- gcc)
-- # This depmode causes a compiler race in universal mode.
-- test "$am__universal" = false || continue
-- ;;
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
-@@ -3468,23 +3419,19 @@
- break
- fi
- ;;
-- msvisualcpp | msvcmsys)
-- # This compiler won't grok `-c -o', but also, the minuso test has
-- # not run yet. These depmodes are late enough in the game, and
-- # so weak that their functioning should not be impacted.
-- am__obj=conftest.${OBJEXT-o}
-- am__minus_obj=
-- ;;
- none) break ;;
- esac
-+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+ # mode. It turns out that the SunPro C++ compiler does not properly
-+ # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
-- source=sub/conftest.c object=$am__obj \
-+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
-@@ -5317,7 +5264,7 @@
-
- { $as_echo "$as_me:$LINENO: checking where octave plugins go" >&5
- $as_echo_n "checking where octave plugins go... " >&6; }
-- OCT_INSTALL_DIR=`echo "path" | $OCTAVE -q 2> /dev/null | grep "/oct/" | head -1`
-+ OCT_INSTALL_DIR=`octave-config --print OCTFILEDIR`
- if test -z "$OCT_INSTALL_DIR"; then
- OCT_INSTALL_DIR=`echo "DEFAULT_LOADPATH" | $OCTAVE -q 2> /dev/null | tr ':' '\n' | grep "site/oct" | head -1`
- fi
-@@ -7116,14 +7063,6 @@
- LTLIBOBJS=$ac_ltlibobjs
-
-
-- if test -n "$EXEEXT"; then
-- am__EXEEXT_TRUE=
-- am__EXEEXT_FALSE='#'
--else
-- am__EXEEXT_TRUE='#'
-- am__EXEEXT_FALSE=
--fi
--
- if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -8312,28 +8251,27 @@
-
-
- case $ac_file$ac_mode in
-- "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-- # Autoconf 2.62 quotes --file arguments for eval, but not when files
-- # are listed without --file. Let's play safe and only enable the eval
-- # if we detect the quoting.
-- case $CONFIG_FILES in
-- *\'*) eval set x "$CONFIG_FILES" ;;
-- *) set x $CONFIG_FILES ;;
-- esac
-- shift
-- for mf
-- do
-- # Strip MF so we end up with the name of the file.
-- mf=`echo "$mf" | sed -e 's/:.*$//'`
-- # Check whether this is an Automake generated Makefile or not.
-- # We used to match only the files named `Makefile.in', but
-- # some people rename them; so instead we look at the file content.
-- # Grep'ing the first line is not enough: some people post-process
-- # each Makefile.in and add a new line on top of each file to say so.
-- # Grep'ing the whole file is not good either: AIX grep has a line
-- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-- dirpart=`$as_dirname -- "$mf" ||
-+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
-+# are listed without --file. Let's play safe and only enable the eval
-+# if we detect the quoting.
-+case $CONFIG_FILES in
-+*\'*) eval set x "$CONFIG_FILES" ;;
-+*) set x $CONFIG_FILES ;;
-+esac
-+shift
-+for mf
-+do
-+ # Strip MF so we end up with the name of the file.
-+ mf=`echo "$mf" | sed -e 's/:.*$//'`
-+ # Check whether this is an Automake generated Makefile or not.
-+ # We used to match only the files named `Makefile.in', but
-+ # some people rename them; so instead we look at the file content.
-+ # Grep'ing the first line is not enough: some people post-process
-+ # each Makefile.in and add a new line on top of each file to say so.
-+ # Grep'ing the whole file is not good either: AIX grep has a line
-+ # limit of 2048, but all sed's we know have understand at least 4000.
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+ dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
-@@ -8356,28 +8294,28 @@
- q
- }
- s/.*/./; q'`
-- else
-- continue
-- fi
-- # 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"`
-- # 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
-- fdir=`$as_dirname -- "$file" ||
-+ else
-+ continue
-+ fi
-+ # 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"`
-+ # 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
-+ fdir=`$as_dirname -- "$file" ||
- $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
-@@ -8400,7 +8338,7 @@
- q
- }
- s/.*/./; q'`
-- { as_dir=$dirpart/$fdir
-+ { as_dir=$dirpart/$fdir
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
-@@ -8441,11 +8379,10 @@
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
- $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
-- # echo "creating $dirpart/$file"
-- echo '# dummy' > "$dirpart/$file"
-- done
-+ # echo "creating $dirpart/$file"
-+ echo '# dummy' > "$dirpart/$file"
- done
--}
-+done
- ;;
-
- esac
-diff -urN h5utils-1.12-orig/configure.ac h5utils-1.12/configure.ac
---- h5utils-1.12-orig/configure.ac 2009-06-12 23:23:38.000000000 +0200
-+++ h5utils-1.12/configure.ac 2009-06-24 15:19:30.000000000 +0200
-@@ -133,7 +133,7 @@
- # try to find installation directory
- AC_CHECK_PROGS(OCTAVE, octave, echo)
- AC_MSG_CHECKING(where octave plugins go)
-- OCT_INSTALL_DIR=`echo "path" | $OCTAVE -q 2> /dev/null | grep "/oct/" | head -1`
-+ OCT_INSTALL_DIR=`octave-config --print OCTFILEDIR`
- if test -z "$OCT_INSTALL_DIR"; then
- OCT_INSTALL_DIR=`echo "DEFAULT_LOADPATH" | $OCTAVE -q 2> /dev/null | tr ':' '\n' | grep "site/oct" | head -1`
- fi
-diff -urN h5utils-1.12-orig/depcomp h5utils-1.12/depcomp
---- h5utils-1.12-orig/depcomp 2009-05-19 17:38:16.000000000 +0200
-+++ h5utils-1.12/depcomp 2009-06-24 15:20:12.000000000 +0200
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # depcomp - compile a program generating dependencies as side-effects
-
--scriptversion=2009-04-28.21; # UTC
-+scriptversion=2007-03-29.01
-
--# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
--# Software Foundation, Inc.
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 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
-@@ -17,7 +17,9 @@
- # GNU General Public License for more details.
-
- # You should have received a copy of the GNU General Public License
--# along with this program. If not, see <http://www.gnu.org/licenses/>.
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -85,15 +87,6 @@
- depmode=dashmstdout
- fi
-
--cygpath_u="cygpath -u -f -"
--if test "$depmode" = msvcmsys; then
-- # This is just like msvisualcpp but w/o cygpath translation.
-- # Just convert the backslash-escaped backslashes to single forward
-- # slashes to satisfy depend.m4
-- cygpath_u="sed s,\\\\\\\\,/,g"
-- depmode=msvisualcpp
--fi
--
- case "$depmode" in
- gcc3)
- ## gcc 3 implements dependency tracking that does exactly what
-@@ -199,14 +192,14 @@
- ' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
- tr '
--' ' ' >> "$depfile"
-- echo >> "$depfile"
-+' ' ' >> $depfile
-+ echo >> $depfile
-
- # The second pass generates a dummy entry for each header file.
- tr ' ' '
- ' < "$tmpdepfile" \
- | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-- >> "$depfile"
-+ >> $depfile
- else
- # The sourcefile does not contain any dependencies, so just
- # store a dummy comment line, to avoid errors with the Makefile
-@@ -335,12 +328,7 @@
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add `dependent.h:' lines.
-- sed -ne '2,${
-- s/^ *//
-- s/ \\*$//
-- s/$/:/
-- p
-- }' "$tmpdepfile" >> "$depfile"
-+ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
-@@ -416,7 +404,7 @@
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
-- while test "X$1" != 'X--mode=compile'; do
-+ while test $1 != '--mode=compile'; do
- shift
- done
- shift
-@@ -467,39 +455,32 @@
- "$@" || exit $?
- # Remove any Libtool call
- if test "$libtool" = yes; then
-- while test "X$1" != 'X--mode=compile'; do
-+ while test $1 != '--mode=compile'; do
- shift
- done
- shift
- fi
- # X makedepend
- shift
-- cleared=no eat=no
-- for arg
-- do
-+ cleared=no
-+ for arg in "$@"; do
- case $cleared in
- no)
- set ""; shift
- cleared=yes ;;
- esac
-- if test $eat = yes; then
-- eat=no
-- continue
-- fi
- case "$arg" in
- -D*|-I*)
- set fnord "$@" "$arg"; shift ;;
- # Strip any option that makedepend may not understand. Remove
- # the object too, otherwise makedepend will parse it as a source file.
-- -arch)
-- eat=yes ;;
- -*|$object)
- ;;
- *)
- set fnord "$@" "$arg"; shift ;;
- esac
- done
-- obj_suffix=`echo "$object" | sed 's/^.*\././'`
-+ obj_suffix="`echo $object | sed 's/^.*\././'`"
- touch "$tmpdepfile"
- ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
- rm -f "$depfile"
-@@ -519,7 +500,7 @@
-
- # Remove the call to Libtool.
- if test "$libtool" = yes; then
-- while test "X$1" != 'X--mode=compile'; do
-+ while test $1 != '--mode=compile'; do
- shift
- done
- shift
-@@ -557,27 +538,13 @@
-
- msvisualcpp)
- # Important note: in order to support this mode, a compiler *must*
-- # always write the preprocessed file to stdout.
-+ # always write the preprocessed file to stdout, regardless of -o,
-+ # because we must use -o when running libtool.
- "$@" || exit $?
--
-- # Remove the call to Libtool.
-- if test "$libtool" = yes; then
-- while test "X$1" != 'X--mode=compile'; do
-- shift
-- done
-- shift
-- fi
--
- IFS=" "
- for arg
- do
- case "$arg" in
-- -o)
-- shift
-- ;;
-- $object)
-- shift
-- ;;
- "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
- set fnord "$@"
- shift
-@@ -590,23 +557,16 @@
- ;;
- esac
- done
-- "$@" -E 2>/dev/null |
-- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-+ "$@" -E |
-+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
- rm -f "$depfile"
- echo "$object : \\" > "$depfile"
-- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
-+ . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
- echo " " >> "$depfile"
-- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-+ . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
- rm -f "$tmpdepfile"
- ;;
-
--msvcmsys)
-- # This case exists only to let depend.m4 do its work. It works by
-- # looking at the text of this script. This case will never be run,
-- # since it is checked for above.
-- exit 1
-- ;;
--
- none)
- exec "$@"
- ;;
-@@ -625,6 +585,5 @@
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
- # time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-time-zone: "UTC"
--# time-stamp-end: "; # UTC"
-+# time-stamp-end: "$"
- # End:
-diff -urN h5utils-1.12-orig/INSTALL h5utils-1.12/INSTALL
---- h5utils-1.12-orig/INSTALL 2009-05-19 17:38:16.000000000 +0200
-+++ h5utils-1.12/INSTALL 2009-06-24 15:20:12.000000000 +0200
-@@ -2,7 +2,7 @@
- *************************
-
- Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
--2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-+2006, 2007, 2008 Free Software Foundation, Inc.
-
- This file is free documentation; the Free Software Foundation gives
- unlimited permission to copy, distribute and modify it.
-@@ -159,7 +159,7 @@
- CC is not installed, it is recommended to use the following options in
- order to use an ANSI C compiler:
-
-- ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-+ ./configure CC="cc -Ae"
-
- and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
-@@ -174,16 +174,6 @@
-
- ./configure CC="cc -nodtk"
-
-- On Solaris, don't put `/usr/ucb' early in your `PATH'. This
--directory contains several dysfunctional programs; working variants of
--these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
--in your `PATH', put it _after_ `/usr/bin'.
--
-- On Haiku, software installed for all users goes in `/boot/common',
--not `/usr/local'. It is recommended to use the following options:
--
-- ./configure --prefix=/boot/common
--
- Specifying the System Type
- ==========================
-
-@@ -199,8 +189,7 @@
-
- where SYSTEM can have one of these forms:
-
-- OS
-- KERNEL-OS
-+ OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
- `config.sub' isn't included in this package, then this package doesn't
-diff -urN h5utils-1.12-orig/install-sh h5utils-1.12/install-sh
---- h5utils-1.12-orig/install-sh 2009-05-19 17:38:16.000000000 +0200
-+++ h5utils-1.12/install-sh 2009-06-24 15:20:12.000000000 +0200
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # install - install a program, script, or datafile
-
--scriptversion=2009-04-28.21; # UTC
-+scriptversion=2006-12-25.00
-
- # This originates from X11R5 (mit/util/scripts/install.sh), which was
- # later released in X11R6 (xc/config/util/install.sh) with the
-@@ -515,6 +515,5 @@
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
- # time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-time-zone: "UTC"
--# time-stamp-end: "; # UTC"
-+# time-stamp-end: "$"
- # End:
-diff -urN h5utils-1.12-orig/Makefile.in h5utils-1.12/Makefile.in
---- h5utils-1.12-orig/Makefile.in 2009-06-12 23:23:43.000000000 +0200
-+++ h5utils-1.12/Makefile.in 2009-06-24 15:20:12.000000000 +0200
-@@ -1,9 +1,8 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.10.2 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
--# Inc.
-+# 2003, 2004, 2005, 2006, 2007, 2008 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.
-@@ -18,9 +17,8 @@
-
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkgincludedir = $(includedir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
--pkglibexecdir = $(libexecdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
-@@ -53,9 +51,9 @@
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = h5topng.1
--CONFIG_CLEAN_VPATH_FILES =
- 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) \
-@@ -92,7 +90,6 @@
- DEFAULT_INCLUDES = -I. at am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
--am__mv = mv -f
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
-@@ -105,30 +102,17 @@
- $(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 = f=`echo $$p | sed -e 's|^.*/||'`;
--am__install_max = 40
--am__nobase_strip_setup = \
-- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
--am__nobase_strip = \
-- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
--am__nobase_list = $(am__nobase_strip_setup); \
-- for p in $$list; do echo "$$p $$p"; done | \
-- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-- if (++n[$$2] == $(am__install_max)) \
-- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-- END { for (dir in files) print dir, files[dir] }'
--am__base_list = \
-- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
--man1dir = $(mandir)/man1
--NROFF = nroff
--MANS = $(dist_man_MANS) $(nodist_man_MANS)
-+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)
- ETAGS = etags
- CTAGS = ctags
-@@ -136,9 +120,9 @@
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
- am__remove_distdir = \
-- { test ! -d "$(distdir)" \
-- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-- && rm -fr "$(distdir)"; }; }
-+ { test ! -d $(distdir) \
-+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+ && rm -fr $(distdir); }; }
- DIST_ARCHIVES = $(distdir).tar.gz
- GZIP_ENV = --best
- distuninstallcheck_listfiles = find . -type f -print
-@@ -284,15 +268,15 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
-+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-+ cd $(srcdir) && $(AUTOMAKE) --gnu \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
-- $(am__cd) $(top_srcdir) && \
-- $(AUTOMAKE) --gnu Makefile
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
-+ cd $(top_srcdir) && \
-+ $(AUTOMAKE) --gnu Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
-@@ -308,10 +292,9 @@
- $(SHELL) ./config.status --recheck
-
- $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-- $(am__cd) $(srcdir) && $(AUTOCONF)
-+ cd $(srcdir) && $(AUTOCONF)
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-- $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
--$(am__aclocal_m4_deps):
-+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
- config.h: stamp-h1
- @if test ! -f $@; then \
-@@ -323,7 +306,7 @@
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
- $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-- ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-+ cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
-
-@@ -334,37 +317,23 @@
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-- for p in $$list; do echo "$$p $$p"; done | \
-- sed 's/$(EXEEXT)$$//' | \
-- while read p p1; do if test -f $$p; \
-- then echo "$$p"; echo "$$p"; else :; fi; \
-- done | \
-- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-- -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-- sed 'N;N;N;s,\n, ,g' | \
-- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-- if ($$2 == $$4) files[d] = files[d] " " $$1; \
-- else { print "f", $$3 "/" $$4, $$1; } } \
-- END { for (d in files) print "f", d, files[d] }' | \
-- while read type dir files; do \
-- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-- test -z "$$files" || { \
-- echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-- $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-- } \
-- ; done
-+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
-+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-+ if test -f $$p \
-+ ; then \
-+ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-+ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+ else :; fi; \
-+ done
-
- uninstall-binPROGRAMS:
- @$(NORMAL_UNINSTALL)
-- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-- files=`for p in $$list; do echo "$$p"; done | \
-- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-- -e 's/$$/$(EXEEXT)/' `; \
-- test -n "$$list" || exit 0; \
-- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-- cd "$(DESTDIR)$(bindir)" && rm -f $$files
-+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
-+ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-+ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(bindir)/$$f"; \
-+ done
-
- clean-binPROGRAMS:
- -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-@@ -423,140 +392,140 @@
-
- .c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @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@ $(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
-- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/h5tov5d-h5tov5d.Tpo $(DEPDIR)/h5tov5d-h5tov5d.Po
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/h5tov5d-h5tov5d.Tpo $(DEPDIR)/h5tov5d-h5tov5d.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='h5tov5d.c' object='h5tov5d-h5tov5d.o' libtool=no @AMDEPBACKSLASH@
- @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@ $(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`
-- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/h5tov5d-h5tov5d.Tpo $(DEPDIR)/h5tov5d-h5tov5d.Po
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/h5tov5d-h5tov5d.Tpo $(DEPDIR)/h5tov5d-h5tov5d.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='h5tov5d.c' object='h5tov5d-h5tov5d.obj' libtool=no @AMDEPBACKSLASH@
- @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@ $(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
-- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/h5tov5d-arrayh5.Tpo $(DEPDIR)/h5tov5d-arrayh5.Po
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/h5tov5d-arrayh5.Tpo $(DEPDIR)/h5tov5d-arrayh5.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='arrayh5.c' object='h5tov5d-arrayh5.o' libtool=no @AMDEPBACKSLASH@
- @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@ $(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`
-- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/h5tov5d-arrayh5.Tpo $(DEPDIR)/h5tov5d-arrayh5.Po
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/h5tov5d-arrayh5.Tpo $(DEPDIR)/h5tov5d-arrayh5.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='arrayh5.c' object='h5tov5d-arrayh5.obj' libtool=no @AMDEPBACKSLASH@
- @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@ $(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
-- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/h5tov5d-h5utils.Tpo $(DEPDIR)/h5tov5d-h5utils.Po
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/h5tov5d-h5utils.Tpo $(DEPDIR)/h5tov5d-h5utils.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='h5utils.c' object='h5tov5d-h5utils.o' libtool=no @AMDEPBACKSLASH@
- @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@ $(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`
-- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/h5tov5d-h5utils.Tpo $(DEPDIR)/h5tov5d-h5utils.Po
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/h5tov5d-h5utils.Tpo $(DEPDIR)/h5tov5d-h5utils.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='h5utils.c' object='h5tov5d-h5utils.obj' libtool=no @AMDEPBACKSLASH@
- @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`
--install-man1: $(dist_man_MANS) $(nodist_man_MANS)
-+install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
- test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-- @list=''; test -n "$(man1dir)" || exit 0; \
-- { for i in $$list; do echo "$$i"; done; \
-- l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-- sed -n '/\.1[a-z]*$$/p'; \
-- } | while read p; do \
-- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-- echo "$$d$$p"; echo "$$p"; \
-- done | \
-- sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-- -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-- sed 'N;N;s,\n, ,g' | { \
-- list=; while read file base inst; do \
-- if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-- fi; \
-+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+ for i in $$l2; do \
-+ case "$$i" in \
-+ *.1*) list="$$list $$i" ;; \
-+ esac; \
- done; \
-- for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-- while read files; do \
-- test -z "$$files" || { \
-- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-- $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-- done; }
--
-+ for i in $$list; do \
-+ if test -f $$i; then file=$$i; \
-+ else file=$(srcdir)/$$i; fi; \
-+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+ case "$$ext" in \
-+ 1*) ;; \
-+ *) ext='1' ;; \
-+ esac; \
-+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
-+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-+ done
- uninstall-man1:
- @$(NORMAL_UNINSTALL)
-- @list=''; test -n "$(man1dir)" || exit 0; \
-- files=`{ for i in $$list; do echo "$$i"; done; \
-- l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-- sed -n '/\.1[a-z]*$$/p'; \
-- } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-- -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-- test -z "$$files" || { \
-- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
-+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-+ for i in $$l2; do \
-+ case "$$i" in \
-+ *.1*) list="$$list $$i" ;; \
-+ esac; \
-+ done; \
-+ for i in $$list; do \
-+ ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+ case "$$ext" in \
-+ 1*) ;; \
-+ *) ext='1' ;; \
-+ esac; \
-+ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+ inst=`echo $$inst | sed -e 's/^.*\///'`; \
-+ inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-+ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-+ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
-+ done
- install-nobase_dist_pkgdataDATA: $(nobase_dist_pkgdata_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-- @list='$(nobase_dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-- $(am__nobase_list) | while read dir files; do \
-- xfiles=; for file in $$files; do \
-- if test -f "$$file"; then xfiles="$$xfiles $$file"; \
-- else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
-- test -z "$$xfiles" || { \
-- test "x$$dir" = x. || { \
-- echo "$(MKDIR_P) '$(DESTDIR)$(pkgdatadir)/$$dir'"; \
-- $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)/$$dir"; }; \
-- echo " $(INSTALL_DATA) $$xfiles '$(DESTDIR)$(pkgdatadir)/$$dir'"; \
-- $(INSTALL_DATA) $$xfiles "$(DESTDIR)$(pkgdatadir)/$$dir" || exit $$?; }; \
-+ @$(am__vpath_adj_setup) \
-+ list='$(nobase_dist_pkgdata_DATA)'; for p in $$list; do \
-+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+ $(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)
-- @list='$(nobase_dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-- $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
-- test -n "$$files" || exit 0; \
-- echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-- cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
-+ @$(am__vpath_adj_setup) \
-+ list='$(nobase_dist_pkgdata_DATA)'; for p in $$list; do \
-+ $(am__vpath_adj) \
-+ echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
-+ done
- install-octDATA: $(oct_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(octdir)" || $(MKDIR_P) "$(DESTDIR)$(octdir)"
-- @list='$(oct_DATA)'; test -n "$(octdir)" || list=; \
-- for p in $$list; do \
-+ @list='$(oct_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- echo "$$d$$p"; \
-- done | $(am__base_list) | \
-- while read files; do \
-- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(octdir)'"; \
-- $(INSTALL_DATA) $$files "$(DESTDIR)$(octdir)" || exit $$?; \
-+ f=$(am__strip_dir) \
-+ echo " $(octDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(octdir)/$$f'"; \
-+ $(octDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(octdir)/$$f"; \
- done
-
- uninstall-octDATA:
- @$(NORMAL_UNINSTALL)
-- @list='$(oct_DATA)'; test -n "$(octdir)" || list=; \
-- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-- test -n "$$files" || exit 0; \
-- echo " ( cd '$(DESTDIR)$(octdir)' && rm -f" $$files ")"; \
-- cd "$(DESTDIR)$(octdir)" && rm -f $$files
-+ @list='$(oct_DATA)'; for p in $$list; do \
-+ f=$(am__strip_dir) \
-+ echo " rm -f '$(DESTDIR)$(octdir)/$$f'"; \
-+ rm -f "$(DESTDIR)$(octdir)/$$f"; \
-+ done
-
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -570,7 +539,7 @@
-
- TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-- set x; \
-+ tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
-@@ -578,54 +547,36 @@
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- shift; \
-- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
-- if test $$# -gt 0; then \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- "$$@" $$unique; \
-- else \
-- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-- $$unique; \
-- fi; \
-+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+ $$tags $$unique; \
- fi
- ctags: CTAGS
- CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
-+ tags=; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
-- test -z "$(CTAGS_ARGS)$$unique" \
-+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-- $$unique
-+ $$tags $$unique
-
- GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
-- && $(am__cd) $(top_srcdir) \
-- && gtags -i $(GTAGS_ARGS) "$$here"
-+ && cd $(top_srcdir) \
-+ && gtags -i $(GTAGS_ARGS) $$here
-
- distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- distdir: $(DISTFILES)
-- @list='$(MANS)'; if test -n "$$list"; then \
-- list=`for p in $$list; do \
-- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-- if test -n "$$list" && \
-- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
-- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-- echo " typically \`make maintainer-clean' will remove them" >&2; \
-- exit 1; \
-- else :; fi; \
-- else :; fi
- $(am__remove_distdir)
-- test -d "$(distdir)" || mkdir "$(distdir)"
-+ test -d $(distdir) || mkdir $(distdir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
-@@ -641,26 +592,21 @@
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test -d "$(distdir)/$$file"; then \
-- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
-- test -f "$(distdir)/$$file" \
-- || cp -p $$d/$$file "$(distdir)/$$file" \
-+ test -f $(distdir)/$$file \
-+ || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
-- -test -n "$(am__skip_mode_fix)" \
-- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-- || chmod -R a+r "$(distdir)"
-+ || chmod -R a+r $(distdir)
- dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-@@ -673,10 +619,6 @@
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
--dist-xz: distdir
-- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-- $(am__remove_distdir)
--
- dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-@@ -705,8 +647,6 @@
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-- *.tar.xz*) \
-- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-@@ -718,11 +658,9 @@
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
- chmod a-w $(distdir)
-- test -d $(distdir)/_build || exit 0; \
- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-- && am__cwd=`pwd` \
-- && $(am__cd) $(distdir)/_build \
-+ && cd $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
- $(DISTCHECK_CONFIGURE_FLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) \
-@@ -744,15 +682,13 @@
- && rm -rf "$$dc_destdir" \
- && $(MAKE) $(AM_MAKEFLAGS) dist \
- && rm -rf $(DIST_ARCHIVES) \
-- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-- && cd "$$am__cwd" \
-- || exit 1
-+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
- $(am__remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
- distuninstallcheck:
-- @$(am__cd) '$(distuninstallcheck_dir)' \
-+ @cd $(distuninstallcheck_dir) \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
- || { echo "ERROR: files left after uninstall:" ; \
- if test -n "$(DESTDIR)"; then \
-@@ -796,7 +732,6 @@
-
- distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
- maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
-@@ -819,8 +754,6 @@
-
- html: html-am
-
--html-am:
--
- info: info-am
-
- info-am:
-@@ -830,28 +763,18 @@
-
- install-dvi: install-dvi-am
-
--install-dvi-am:
--
- install-exec-am: install-binPROGRAMS
-
- install-html: install-html-am
-
--install-html-am:
--
- install-info: install-info-am
-
--install-info-am:
--
- install-man: install-man1
-
- install-pdf: install-pdf-am
-
--install-pdf-am:
--
- install-ps: install-ps-am
-
--install-ps-am:
--
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -878,25 +801,25 @@
-
- uninstall-man: uninstall-man1
-
--.MAKE: all install-am install-strip
-+.MAKE: install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
- clean-binPROGRAMS clean-generic clean-noinstPROGRAMS ctags \
- dist dist-all dist-bzip2 dist-gzip dist-lzma dist-shar \
-- dist-tarZ dist-xz dist-zip distcheck distclean \
-- distclean-compile distclean-generic distclean-hdr \
-- distclean-tags distcleancheck distdir distuninstallcheck dvi \
-- dvi-am html html-am info info-am install install-am \
-- install-binPROGRAMS install-data install-data-am install-dvi \
-- install-dvi-am install-exec install-exec-am install-html \
-- install-html-am install-info install-info-am install-man \
-- install-man1 install-nobase_dist_pkgdataDATA install-octDATA \
-- install-pdf install-pdf-am install-ps install-ps-am \
-- install-strip installcheck installcheck-am installdirs \
-- maintainer-clean maintainer-clean-generic mostlyclean \
-- mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-- tags uninstall uninstall-am uninstall-binPROGRAMS \
-- uninstall-man uninstall-man1 uninstall-nobase_dist_pkgdataDATA \
-+ dist-tarZ dist-zip distcheck distclean distclean-compile \
-+ distclean-generic distclean-hdr distclean-tags distcleancheck \
-+ distdir distuninstallcheck dvi dvi-am html html-am info \
-+ info-am install install-am install-binPROGRAMS install-data \
-+ install-data-am install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
-+ install-info-am install-man install-man1 \
-+ install-nobase_dist_pkgdataDATA install-octDATA install-pdf \
-+ install-pdf-am install-ps install-ps-am install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
-+ maintainer-clean-generic mostlyclean mostlyclean-compile \
-+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-+ uninstall-am uninstall-binPROGRAMS uninstall-man \
-+ uninstall-man1 uninstall-nobase_dist_pkgdataDATA \
- uninstall-octDATA
-
-
-@@ -913,7 +836,6 @@
- darcs changes --summary > $(distdir)/ChangeLog
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff -urN h5utils-1.12-orig/missing h5utils-1.12/missing
---- h5utils-1.12-orig/missing 2009-05-19 17:38:16.000000000 +0200
-+++ h5utils-1.12/missing 2009-06-24 15:20:12.000000000 +0200
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
-
--scriptversion=2009-04-28.21; # UTC
-+scriptversion=2006-05-10.23
-
--# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
--# 2008, 2009 Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-+# Free Software Foundation, Inc.
- # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
-
- # This program is free software; you can redistribute it and/or modify
-@@ -18,7 +18,9 @@
- # GNU General Public License for more details.
-
- # You should have received a copy of the GNU General Public License
--# along with this program. If not, see <http://www.gnu.org/licenses/>.
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -87,9 +89,6 @@
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-
--Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
--\`g' are ignored when checking the name.
--
- Send bug reports to <bug-automake at gnu.org>."
- exit $?
- ;;
-@@ -107,22 +106,15 @@
-
- esac
-
--# normalize program name to check for.
--program=`echo "$1" | sed '
-- s/^gnu-//; t
-- s/^gnu//; t
-- s/^g//; t'`
--
- # 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). This is about non-GNU programs, so use $1 not
--# $program.
-+# the program).
- case $1 in
-- lex*|yacc*)
-+ lex|yacc)
- # Not GNU programs, they don't have --version.
- ;;
-
-- tar*)
-+ tar)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
-@@ -146,7 +138,7 @@
-
- # If it does not exist, or fails to run (possibly an outdated version),
- # try to emulate it.
--case $program in
-+case $1 in
- aclocal*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
-@@ -156,7 +148,7 @@
- touch aclocal.m4
- ;;
-
-- autoconf*)
-+ autoconf)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
-@@ -165,7 +157,7 @@
- touch configure
- ;;
-
-- autoheader*)
-+ autoheader)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
-@@ -195,7 +187,7 @@
- while read f; do touch "$f"; done
- ;;
-
-- autom4te*)
-+ autom4te)
- echo 1>&2 "\
- WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
-@@ -218,7 +210,7 @@
- fi
- ;;
-
-- bison*|yacc*)
-+ bison|yacc)
- echo 1>&2 "\
- WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
-@@ -248,7 +240,7 @@
- fi
- ;;
-
-- lex*|flex*)
-+ lex|flex)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
-@@ -271,7 +263,7 @@
- fi
- ;;
-
-- help2man*)
-+ help2man)
- 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
-@@ -285,11 +277,11 @@
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
-- exit $?
-+ exit 1
- fi
- ;;
-
-- makeinfo*)
-+ makeinfo)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
-@@ -318,7 +310,7 @@
- touch $file
- ;;
-
-- tar*)
-+ tar)
- shift
-
- # We have already tried tar in the generic part.
-@@ -371,6 +363,5 @@
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
- # time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-time-zone: "UTC"
--# time-stamp-end: "; # UTC"
-+# time-stamp-end: "$"
- # End:
Modified: packages/h5utils/trunk/debian/patches/series
===================================================================
--- packages/h5utils/trunk/debian/patches/series 2010-04-04 06:11:40 UTC (rev 2811)
+++ packages/h5utils/trunk/debian/patches/series 2010-04-04 18:48:12 UTC (rev 2812)
@@ -1 +1 @@
-octave.diff -p1
+# no patch
Modified: packages/h5utils/trunk/debian/rules
===================================================================
--- packages/h5utils/trunk/debian/rules 2010-04-04 06:11:40 UTC (rev 2811)
+++ packages/h5utils/trunk/debian/rules 2010-04-04 18:48:12 UTC (rev 2812)
@@ -15,7 +15,7 @@
endif
# LFS support
-ifeq ($(shell grep '^[[:space:]]*Linux Large File Support (LFS)' /usr/lib/libhdf5.settings | sed 's/^[[:space:]]*Linux Large File Support (LFS):[[:space:]]*//'),Enabled)
+ifeq ($(shell grep '^[[:space:]]*Linux Large File Support (LFS)' /usr/lib/libhdf5.settings | sed 's/^[[:space:]]*Linux Large File Support (LFS):[[:space:]]*//'),yes)
CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_POSIX_SOURCE -D_BSD_SOURCE
export CPPFLAGS
endif
More information about the Pkg-grass-devel
mailing list