[h5utils] 16/39: Imported Upstream version 1.12.1
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Jul 21 23:56:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository h5utils.
commit a1be952ff8f32ec46be8bce05ba6c13dbddc8b5f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Jul 21 23:12:26 2015 +0200
Imported Upstream version 1.12.1
---
ChangeLog | 15 +++++++++++++
Makefile.in | 1 +
NEWS | 5 +++++
configure | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
configure.ac | 11 ++++++++--
5 files changed, 91 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b83cabe..d631282 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Wed Jun 24 13:01:40 EDT 2009 stevenj at alum.mit.edu
+ * date for 1.12.1 release
+
+ M ./NEWS -1 +1
+
+Wed Jun 24 13:00:51 EDT 2009 stevenj at alum.mit.edu
+ * use octave-config to detect installation path for Octave plugins
+
+ M ./NEWS +5
+ M ./configure.ac -2 +9
+
+Fri Jun 12 17:42:21 EDT 2009 stevenj at alum.mit.edu
+ tagged h5utils-1.12
+
+
Fri Jun 12 17:34:08 EDT 2009 stevenj at alum.mit.edu
* Fixed installation of h5read.oct for Octave 3.x.
diff --git a/Makefile.in b/Makefile.in
index 3192c84..39b6066 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -185,6 +185,7 @@ MORE_H5UTILS = @MORE_H5UTILS@
MORE_H5UTILS_MANS = @MORE_H5UTILS_MANS@
OBJEXT = @OBJEXT@
OCTAVE = @OCTAVE@
+OCTAVE_CONFIG = @OCTAVE_CONFIG@
OCT_INSTALL_DIR = @OCT_INSTALL_DIR@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff --git a/NEWS b/NEWS
index 8241a23..8257544 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+h5utils 1.12.1 (6/24/09)
+
+ * Use octave-config, if available, to detect octave-plugin installation
+ path (thanks to Debian bug report #516453 for suggestion).
+
h5utils 1.12 (6/12/09)
* The vertical axis in h5topng is now reversed to correspond to
diff --git a/configure b/configure
index e60e669..ccac7aa 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for h5utils 1.12.
+# Generated by GNU Autoconf 2.63 for h5utils 1.12.1.
#
# Report bugs to <stevenj at alum.mit.edu>.
#
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='h5utils'
PACKAGE_TARNAME='h5utils'
-PACKAGE_VERSION='1.12'
-PACKAGE_STRING='h5utils 1.12'
+PACKAGE_VERSION='1.12.1'
+PACKAGE_STRING='h5utils 1.12.1'
PACKAGE_BUGREPORT='stevenj at alum.mit.edu'
ac_unique_file="h5topng.c"
@@ -648,6 +648,7 @@ V5D_INCLUDES
V5D_FILES
OCT_INSTALL_DIR
H5READ
+OCTAVE_CONFIG
OCTAVE
MKOCTFILE
H4_LIBS
@@ -1307,7 +1308,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures h5utils 1.12 to adapt to many kinds of systems.
+\`configure' configures h5utils 1.12.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1373,7 +1374,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of h5utils 1.12:";;
+ short | recursive ) echo "Configuration of h5utils 1.12.1:";;
esac
cat <<\_ACEOF
@@ -1470,7 +1471,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-h5utils configure 1.12
+h5utils configure 1.12.1
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1484,7 +1485,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by h5utils $as_me 1.12, which was
+It was created by h5utils $as_me 1.12.1, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2333,7 +2334,7 @@ fi
# Define the identity of the package.
PACKAGE='h5utils'
- VERSION='1.12'
+ VERSION='1.12.1'
cat >>confdefs.h <<_ACEOF
@@ -5315,9 +5316,58 @@ fi
done
test -n "$OCTAVE" || OCTAVE="echo"
+ for ac_prog in octave-config
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; 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_OCTAVE_CONFIG+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$OCTAVE_CONFIG"; then
+ ac_cv_prog_OCTAVE_CONFIG="$OCTAVE_CONFIG" # 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_OCTAVE_CONFIG="$ac_prog"
+ $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
+OCTAVE_CONFIG=$ac_cv_prog_OCTAVE_CONFIG
+if test -n "$OCTAVE_CONFIG"; then
+ { $as_echo "$as_me:$LINENO: result: $OCTAVE_CONFIG" >&5
+$as_echo "$OCTAVE_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$OCTAVE_CONFIG" && break
+done
+test -n "$OCTAVE_CONFIG" || OCTAVE_CONFIG="echo"
+
{ $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 --oct-site-dir 2> /dev/null | grep '/'`
+ if test -z "$OCT_INSTALL_DIR"; then
+ OCT_INSTALL_DIR=`octave-config --print OCTFILEDIR 2> /dev/null | grep '/'`
+ fi
+ if test -z "$OCT_INSTALL_DIR"; then
+ OCT_INSTALL_DIR=`echo "path" | $OCTAVE -q 2> /dev/null | grep "/oct/" | head -1`
+ fi
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
@@ -7468,7 +7518,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by h5utils $as_me 1.12, which was
+This file was extended by h5utils $as_me 1.12.1, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7531,7 +7581,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-h5utils config.status 1.12
+h5utils config.status 1.12.1
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index cfb50f2..09c6c63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT(h5utils, 1.12, stevenj at alum.mit.edu)
+AC_INIT(h5utils, 1.12.1, stevenj at alum.mit.edu)
AM_INIT_AUTOMAKE(1.6)
AC_CONFIG_SRCDIR([h5topng.c])
AM_CONFIG_HEADER(config.h)
@@ -132,8 +132,15 @@ if test "$MKOCTFILE" = "echo"; then
else
# try to find installation directory
AC_CHECK_PROGS(OCTAVE, octave, echo)
+ AC_CHECK_PROGS(OCTAVE_CONFIG, octave-config, 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 --oct-site-dir 2> /dev/null | grep '/'`
+ if test -z "$OCT_INSTALL_DIR"; then
+ OCT_INSTALL_DIR=`octave-config --print OCTFILEDIR 2> /dev/null | grep '/'`
+ fi
+ if test -z "$OCT_INSTALL_DIR"; then
+ OCT_INSTALL_DIR=`echo "path" | $OCTAVE -q 2> /dev/null | grep "/oct/" | head -1`
+ fi
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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/h5utils.git
More information about the Pkg-grass-devel
mailing list