[ncview] 02/07: Imported Upstream version 2.1.8+ds
Bas Couwenberg
sebastic at debian.org
Thu Mar 9 06:52:42 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository ncview.
commit 24fe4598874f1f95948952cef3f46f0d1a0127ac
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Mar 9 07:30:16 2017 +0100
Imported Upstream version 2.1.8+ds
---
Ncview-appdefaults | 3 +-
README_LOCAL | 6 +-
configure | 226 +++++++++++++++++++++++++++++----------------------
configure.in | 2 +-
m4macros/udunits2.m4 | 6 ++
src/SciPlot.c | 2 +-
src/do_print.c | 4 +-
src/file_netcdf.c | 2 +-
src/ncview.c | 1 +
src/ncview.defines.h | 4 +-
src/ncview.protos.h | 1 +
11 files changed, 148 insertions(+), 109 deletions(-)
diff --git a/Ncview-appdefaults b/Ncview-appdefaults
index 9568575..78052b1 100755
--- a/Ncview-appdefaults
+++ b/Ncview-appdefaults
@@ -53,8 +53,9 @@ Ncview*quit*label: Quit
Ncview*foreground: azure
Ncview*background: SteelBlue
Ncview*PlotXY_canvas*background: LightSteelBlue
+Ncview*PlotXY*font: -*-courier-*-r-*-*-34-*-*-*-*-*-*-*
!
-Ncview*font: -*-helvetica-*-r-*-*-14-*-*-*-*-*-*-*
+Ncview*font: -*-lucida-bold-r-*-*-14-*-*-*-*-*-*-*
Ncview*axisFont: 10
!
Ncview*ccontour*borderWidth: 0
diff --git a/README_LOCAL b/README_LOCAL
index 6517ffa..36cb2bf 100644
--- a/README_LOCAL
+++ b/README_LOCAL
@@ -1,6 +1,2 @@
-##./configure --prefix=$HOME --with-udunits2_incdir=/home/pierce/src/packages/data/udunits/udunits-2.1.23/install/include --with-udunits2_libdir=/home/pierce/src/packages/data/udunits/udunits-2.1.23/install/lib
-
-##./configure --prefix=$HOME --with-udunits2_incdir=/home/pierce/src/packages/data/udunits/udunits-2.1.11/install/include --with-udunits2_libdir=/home/pierce/src/packages/data/udunits/udunits-2.1.11/install/lib
-
-./configure --prefix=$HOME --with-udunits2_incdir=/home/pierce/src/packages/data/udunits/udunits-2.1.11/install/include --with-udunits2_libdir=/home/pierce/src/packages/data/udunits/udunits-2.1.11/install/lib --with-nc-config=/home/pierce/src/packages/data/netcdf/netcdf-c-4.3.2/install/bin/nc-config
+./configure --prefix=$HOME --with-udunits2_incdir=/home/pierce/src/packages/data/udunits/udunits-2.2.20/install_dir/include --with-udunits2_libdir=/home/pierce/src/packages/data/udunits/udunits-2.2.20/install_dir/lib --with-nc-config=/home/pierce/src/packages/data/netcdf/netcdf-c-4.3.2/install/bin/nc-config
diff --git a/configure b/configure
index ad9d75a..3a73d26 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for ncview 2.0.0.
+# Generated by GNU Autoconf 2.69 for ncview 2.0.0.
#
# Report bugs to <dpierce at ucsd.edu>.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -214,21 +238,25 @@ IFS=$as_save_IFS
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
@@ -331,6 +359,14 @@ $as_echo X"$as_dir" |
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -452,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -486,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -507,28 +547,8 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -697,6 +717,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -775,6 +796,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1027,6 +1049,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1164,7 +1195,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1192,8 +1223,6 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1319,6 +1348,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1448,9 +1478,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
ncview configure 2.0.0
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1526,7 +1556,7 @@ $as_echo "$ac_try_echo"; } >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -1817,7 +1847,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by ncview $as_me 2.0.0, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2200,7 +2230,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_HAS_NC_CONFIG="yes"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2311,7 +2341,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2355,7 +2385,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2799,8 +2829,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3096,7 +3125,7 @@ do
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -3162,7 +3191,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -3394,7 +3423,7 @@ case $as_dir/ in #((
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -3563,7 +3592,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3603,7 +3632,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3654,7 +3683,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
@@ -3707,7 +3736,7 @@ 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
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5086,6 +5115,14 @@ fi
fi
if test x$UDUNITS2_INCDIR = x; then
+ ac_fn_c_check_header_mongrel "$LINENO" "/usr/include/udunits2/udunits2.h" "ac_cv_header__usr_include_udunits2_udunits2_h" "$ac_includes_default"
+if test "x$ac_cv_header__usr_include_udunits2_udunits2_h" = xyes; then :
+ UDUNITS2_INCDIR=/usr/include/udunits2
+fi
+
+
+fi
+if test x$UDUNITS2_INCDIR = x; then
as_ac_Header=`$as_echo "ac_cv_header_$HOME/include/udunits2.h" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$HOME/include/udunits2.h" "$as_ac_Header" "$ac_includes_default"
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
@@ -5095,6 +5132,15 @@ fi
fi
if test x$UDUNITS2_INCDIR = x; then
+ as_ac_Header=`$as_echo "ac_cv_header_$HOME/include/udunits2/udunits2.h" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$HOME/include/udunits2/udunits2.h" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ UDUNITS2_INCDIR=$HOME/include/udunits2
+fi
+
+
+fi
+if test x$UDUNITS2_INCDIR = x; then
ac_fn_c_check_header_mongrel "$LINENO" "/sw/include/udunits2.h" "ac_cv_header__sw_include_udunits2_h" "$ac_includes_default"
if test "x$ac_cv_header__sw_include_udunits2_h" = xyes; then :
UDUNITS2_INCDIR=/sw/include
@@ -5411,7 +5457,7 @@ else
echo "of udunits2 support. If you DO use udunits2 format date strings, and"
echo "you want the udunits2 support, then you must tell me where to find"
echo "the udunits2 package by giving arguments to configure, as follows:"
- echo " ./configure -with-udunits2_incdir=include_directory -with-udunits2_libdir=library_directory"
+ echo " ./configure --with-udunits2_incdir=include_directory --with-udunits2_libdir=library_directory"
echo "************************************************************************"
DO_UDUNITS2_LINE="#INC_UDUNITS2 = -DINC_UDUNITS2"
DO_UDUNITS2_INCDIR="#UDUNITS2INCDIR = -I$UDUNITS2_INCDIR"
@@ -6257,16 +6303,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -6326,28 +6372,16 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -6369,7 +6403,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
This file was extended by ncview $as_me 2.0.0, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -6435,10 +6469,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
ncview config.status 2.0.0
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -6529,7 +6563,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
diff --git a/configure.in b/configure.in
index a301d37..be0a7ee 100644
--- a/configure.in
+++ b/configure.in
@@ -150,7 +150,7 @@ else
echo "of udunits2 support. If you DO use udunits2 format date strings, and"
echo "you want the udunits2 support, then you must tell me where to find"
echo "the udunits2 package by giving arguments to configure, as follows:"
- echo " ./configure -with-udunits2_incdir=include_directory -with-udunits2_libdir=library_directory"
+ echo " ./configure --with-udunits2_incdir=include_directory --with-udunits2_libdir=library_directory"
echo "************************************************************************"
DO_UDUNITS2_LINE="#INC_UDUNITS2 = -DINC_UDUNITS2"
DO_UDUNITS2_INCDIR="#UDUNITS2INCDIR = -I$UDUNITS2_INCDIR"
diff --git a/m4macros/udunits2.m4 b/m4macros/udunits2.m4
index 34f1230..35dcd8b 100644
--- a/m4macros/udunits2.m4
+++ b/m4macros/udunits2.m4
@@ -55,9 +55,15 @@ if test x$UDUNITS2_INCDIR = x; then
AC_CHECK_HEADER( /usr/include/udunits2.h, UDUNITS2_INCDIR=/usr/include )
fi
if test x$UDUNITS2_INCDIR = x; then
+ AC_CHECK_HEADER( /usr/include/udunits2/udunits2.h, UDUNITS2_INCDIR=/usr/include/udunits2 )
+fi
+if test x$UDUNITS2_INCDIR = x; then
AC_CHECK_HEADER( $HOME/include/udunits2.h, UDUNITS2_INCDIR=$HOME/include )
fi
if test x$UDUNITS2_INCDIR = x; then
+ AC_CHECK_HEADER( $HOME/include/udunits2/udunits2.h, UDUNITS2_INCDIR=$HOME/include/udunits2 )
+fi
+if test x$UDUNITS2_INCDIR = x; then
AC_CHECK_HEADER( /sw/include/udunits2.h, UDUNITS2_INCDIR=/sw/include )
fi
dnl
diff --git a/src/SciPlot.c b/src/SciPlot.c
index 0f6f3cc..e13dac3 100644
--- a/src/SciPlot.c
+++ b/src/SciPlot.c
@@ -2197,7 +2197,7 @@ Boolean firstx,firsty;
w->plot.UserMin.y = 1.e-4 * w->plot.UserMax.y;
w->plot.Min.y=w->plot.UserMin.y;
w->plot.Max.y=w->plot.UserMax.y;
-printf( "sciplot: just set y range to %d %d\n", w->plot.Min.y, w->plot.Max.y );
+printf( "sciplot: just set y range to %lf %lf\n", w->plot.Min.y, w->plot.Max.y );
}
}
}
diff --git a/src/do_print.c b/src/do_print.c
index 9ee3d4d..ea07253 100644
--- a/src/do_print.c
+++ b/src/do_print.c
@@ -205,7 +205,7 @@ print_other_info( FILE *outf, float output_scale, size_t x_size, size_t y_size,
*dim_name, *dim_longname;
FDBlist *fdb;
NCDim *d;
- int i, type, has_bounds;
+ int i, type, has_bounds, istat;
size_t *actual_place;
time_t sec_since_1970;
double temp_double, bound_min, bound_max;
@@ -387,7 +387,7 @@ print_other_info( FILE *outf, float output_scale, size_t x_size, size_t y_size,
}
fclose( f_dummy );
snprintf( tstr, 1499, "lpr \"%s\"\n", printopts.out_file_name );
- system( tstr );
+ istat = system( tstr );
unlink( printopts.out_file_name );
}
diff --git a/src/file_netcdf.c b/src/file_netcdf.c
index a3752a8..c38882c 100644
--- a/src/file_netcdf.c
+++ b/src/file_netcdf.c
@@ -372,7 +372,7 @@ int netcdf_fi_n_dims( int fileid, char *var_name )
}
/*******************************************************************************************/
-size_t netcdf_dim_size( fileid, dimid )
+size_t netcdf_dim_size( int fileid, int dimid )
{
size_t ret_val;
int err;
diff --git a/src/ncview.c b/src/ncview.c
index 4c6900f..d9d9230 100644
--- a/src/ncview.c
+++ b/src/ncview.c
@@ -76,6 +76,7 @@ static void init_cmaps_from_data();
static void init_cmap_from_data( char *colormap_name, int *data );
static int get_cmaps_from_dir( char *dir_name );
static int ncview_cmap_suffix( char *s, int *n_suffix );
+static int any_var_in_group( NCVar *var );
/***********************************************************************************************/
int
diff --git a/src/ncview.defines.h b/src/ncview.defines.h
index 101f697..bc7d0d8 100644
--- a/src/ncview.defines.h
+++ b/src/ncview.defines.h
@@ -31,8 +31,8 @@
#include <udunits2.h>
#endif
-#define PROGRAM_ID "Ncview 2.1.7 David W. Pierce 29 March 2016"
-#define PROGRAM_VERSION_STRING "2.1.7"
+#define PROGRAM_ID "Ncview 2.1.8 David W. Pierce 8 March 2017"
+#define PROGRAM_VERSION_STRING "2.1.8"
#define APP_RES_VERSION 1.93
#ifndef TRUE
diff --git a/src/ncview.protos.h b/src/ncview.protos.h
index 31488ed..01603f4 100644
--- a/src/ncview.protos.h
+++ b/src/ncview.protos.h
@@ -140,6 +140,7 @@ int is_scannable ( NCVar *v, int i );
void sl_cat ( Stringlist **dest, Stringlist **src );
void get_min_max_onestep( NCVar *var, size_t n_other, size_t tstep, float *data,
float *min, float *max, int verbose );
+int unpack_groupname( char *varname, int ig, char *groupname );
void cache_scalar_coord_info( NCVar *vars );
int count_nslashes ( char *s );
Stringlist *get_group_list ( NCVar *vars );
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ncview.git
More information about the Pkg-grass-devel
mailing list