# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1458396323 14400
# Node ID 6a33c32796b2e5775f37017390eb60d633be1c5c
# Parent  4970d27d3e129c6124db9f75d8e447149c79f148
of-octcdf: update to 1.1.10

* src/of-octcdf.mk: update version, checksum

* src/of-octcdf-1-cross-fixes.patch: removed file

* dist-files.mk: remove ref to of-octcdf-1-cross-fixes.patch

diff -r 4970d27d3e12 -r 6a33c32796b2 dist-files.mk
--- a/dist-files.mk	Sat Mar 19 10:00:08 2016 -0400
+++ b/dist-files.mk	Sat Mar 19 10:05:23 2016 -0400
@@ -487,7 +487,6 @@
   of-nurbs.mk \
   of-ocs-1-cross-fixes.patch \
   of-ocs.mk \
-  of-octcdf-1-cross-fixes.patch \
   of-octcdf.mk \
   of-odepkg.mk \
   of-optim.mk \
diff -r 4970d27d3e12 -r 6a33c32796b2 src/of-octcdf-1-cross-fixes.patch
--- a/src/of-octcdf-1-cross-fixes.patch	Sat Mar 19 10:00:08 2016 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1138 +0,0 @@
-diff -ur octcdf.orig/src/configure octcdf/src/configure
---- octcdf.orig/src/configure	2015-04-14 11:21:17.161247377 -0400
-+++ octcdf/src/configure	2015-04-14 11:22:49.289084238 -0400
-@@ -195,8 +195,7 @@
-   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'\" &&
--  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
--test \$(( 1 + 1 )) = 2 || exit 1"
-+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
-   if (eval "$as_required") 2>/dev/null; then :
-   as_have_required=yes
- else
-@@ -583,50 +582,12 @@
- PACKAGE_URL=
- 
- ac_unique_file="configure.base"
--# Factoring default headers for most tests.
--ac_includes_default="\
--#include <stdio.h>
--#ifdef HAVE_SYS_TYPES_H
--# include <sys/types.h>
--#endif
--#ifdef HAVE_SYS_STAT_H
--# include <sys/stat.h>
--#endif
--#ifdef STDC_HEADERS
--# include <stdlib.h>
--# include <stddef.h>
--#else
--# ifdef HAVE_STDLIB_H
--#  include <stdlib.h>
--# endif
--#endif
--#ifdef HAVE_STRING_H
--# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
--#  include <memory.h>
--# endif
--# include <string.h>
--#endif
--#ifdef HAVE_STRINGS_H
--# include <strings.h>
--#endif
--#ifdef HAVE_INTTYPES_H
--# include <inttypes.h>
--#endif
--#ifdef HAVE_STDINT_H
--# include <stdint.h>
--#endif
--#ifdef HAVE_UNISTD_H
--# include <unistd.h>
--#endif"
--
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
- OCTCDF_CFLAGS
- OCTCDF_LIBS
- HAVE_NETCDF
--EGREP
--GREP
--CPP
-+NC_CONFIG
- STRIP
- COPY_FLAGS
- RANLIB
-@@ -643,6 +604,7 @@
- mpath
- subver
- ver
-+OCTAVE_CONFIG
- MKOCTFILE
- OBJEXT
- EXEEXT
-@@ -710,8 +672,7 @@
- CFLAGS
- LDFLAGS
- LIBS
--CPPFLAGS
--CPP'
-+CPPFLAGS'
- 
- 
- # Initialize some variables set by options.
-@@ -1334,7 +1295,6 @@
-   LIBS        libraries to pass to the linker, e.g. -l<library>
-   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-               you have headers in a nonstandard directory <include dir>
--  CPP         C preprocessor
- 
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -1453,249 +1413,6 @@
-   as_fn_set_status $ac_retval
- 
- } # ac_fn_c_try_compile
--
--# ac_fn_c_try_link LINENO
--# -----------------------
--# Try to link conftest.$ac_ext, and return whether this succeeded.
--ac_fn_c_try_link ()
--{
--  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  rm -f conftest.$ac_objext conftest$ac_exeext
--  if { { ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
--  (eval "$ac_link") 2>conftest.err
--  ac_status=$?
--  if test -s conftest.err; then
--    grep -v '^ *+' conftest.err >conftest.er1
--    cat conftest.er1 >&5
--    mv -f conftest.er1 conftest.err
--  fi
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 test -x conftest$ac_exeext
--       }; then :
--  ac_retval=0
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_retval=1
--fi
--  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
--  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
--  # interfere with the next link command; also delete a directory that is
--  # left behind by Apple's compiler.  We do this before executing the actions.
--  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
--  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
--  as_fn_set_status $ac_retval
--
--} # ac_fn_c_try_link
--
--# ac_fn_c_try_cpp LINENO
--# ----------------------
--# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
--ac_fn_c_try_cpp ()
--{
--  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  if { { ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
--  ac_status=$?
--  if test -s conftest.err; then
--    grep -v '^ *+' conftest.err >conftest.er1
--    cat conftest.er1 >&5
--    mv -f conftest.er1 conftest.err
--  fi
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } > conftest.i && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then :
--  ac_retval=0
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--    ac_retval=1
--fi
--  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
--  as_fn_set_status $ac_retval
--
--} # ac_fn_c_try_cpp
--
--# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
--# -------------------------------------------------------
--# Tests whether HEADER exists, giving a warning if it cannot be compiled using
--# the include files in INCLUDES and setting the cache variable VAR
--# accordingly.
--ac_fn_c_check_header_mongrel ()
--{
--  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  if eval \${$3+:} false; then :
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
--$as_echo_n "checking for $2... " >&6; }
--if eval \${$3+:} false; then :
--  $as_echo_n "(cached) " >&6
--fi
--eval ac_res=\$$3
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--else
--  # Is the header compilable?
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
--$as_echo_n "checking $2 usability... " >&6; }
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--$4
--#include <$2>
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  ac_header_compiler=yes
--else
--  ac_header_compiler=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
--$as_echo_n "checking $2 presence... " >&6; }
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <$2>
--_ACEOF
--if ac_fn_c_try_cpp "$LINENO"; then :
--  ac_header_preproc=yes
--else
--  ac_header_preproc=no
--fi
--rm -f conftest.err conftest.i conftest.$ac_ext
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
--  yes:no: )
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
--    ;;
--  no:yes:* )
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
--    ;;
--esac
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
--$as_echo_n "checking for $2... " >&6; }
--if eval \${$3+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  eval "$3=\$ac_header_compiler"
--fi
--eval ac_res=\$$3
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--fi
--  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
--
--} # ac_fn_c_check_header_mongrel
--
--# ac_fn_c_try_run LINENO
--# ----------------------
--# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
--# that executables *can* be run.
--ac_fn_c_try_run ()
--{
--  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  if { { ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
--  { { case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--$as_echo "$ac_try_echo"; } >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--  test $ac_status = 0; }; }; then :
--  ac_retval=0
--else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--       $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--       ac_retval=$ac_status
--fi
--  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
--  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
--  as_fn_set_status $ac_retval
--
--} # ac_fn_c_try_run
--
--# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
--# -------------------------------------------------------
--# Tests whether HEADER exists and can be compiled using the include files in
--# INCLUDES, setting the cache variable VAR accordingly.
--ac_fn_c_check_header_compile ()
--{
--  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
--$as_echo_n "checking for $2... " >&6; }
--if eval \${$3+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--$4
--#include <$2>
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  eval "$3=yes"
--else
--  eval "$3=no"
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--eval ac_res=\$$3
--	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
--
--} # ac_fn_c_check_header_compile
- cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
-@@ -2897,6 +2614,46 @@
- test -z "$MKOCTFILE" &&	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no mkoctfile found on path" >&5
- $as_echo "$as_me: WARNING: no mkoctfile found on path" >&2;}
- 
-+# Extract the first word of "octave-config", so it can be a program name with args.
-+set dummy octave-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_OCTAVE_CONFIG+:} false; 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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_OCTAVE_CONFIG="octave-config"
-+    $as_echo "$as_me:${as_lineno-$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:${as_lineno-$LINENO}: result: $OCTAVE_CONFIG" >&5
-+$as_echo "$OCTAVE_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+test -z "$OCTAVE_CONFIG" &&	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no octave-config found on path" >&5
-+$as_echo "$as_me: WARNING: no octave-config found on path" >&2;}
-+
- 
- 
- 
-@@ -3083,6 +2840,8 @@
- 
- 
- 
-+
-+
- # Extract the first word of "octave", so it can be a program name with args.
- set dummy octave; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-@@ -3120,25 +2879,25 @@
- fi
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCTAVE_VERSION in Octave" >&5
--$as_echo_n "checking for OCTAVE_VERSION in Octave... " >&6; }
--OCTAVE_VERSION=`echo "disp(OCTAVE_VERSION)" | $OCTAVE -qf`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VERSION in octave-config" >&5
-+$as_echo_n "checking for VERSION in octave-config... " >&6; }
-+OCTAVE_VERSION=`$OCTAVE_CONFIG -p VERSION`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE_VERSION" >&5
- $as_echo "$OCTAVE_VERSION" >&6; }
- 
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave_config_info('canonical_host_type') in Octave" >&5
--$as_echo_n "checking for octave_config_info('canonical_host_type') in Octave... " >&6; }
--canonical_host_type=`echo "disp(octave_config_info('canonical_host_type'))" | $OCTAVE -qf`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CANONICAL_HOST_TYPE in octave-config" >&5
-+$as_echo_n "checking for CANONICAL_HOST_TYPE in octave-config... " >&6; }
-+canonical_host_type=`$OCTAVE_CONFIG -p CANONICAL_HOST_TYPE`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $canonical_host_type" >&5
- $as_echo "$canonical_host_type" >&6; }
- 
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave_config_info('SHLEXT') in Octave" >&5
--$as_echo_n "checking for octave_config_info('SHLEXT') in Octave... " >&6; }
--SHLEXT=`echo "disp(octave_config_info('SHLEXT'))" | $OCTAVE -qf`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHLEXT in octave-config" >&5
-+$as_echo_n "checking for SHLEXT in octave-config... " >&6; }
-+SHLEXT=`$OCTAVE_CONFIG -p SHLEXT`
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHLEXT" >&5
- $as_echo "$SHLEXT" >&6; }
- 
-@@ -3306,489 +3065,105 @@
-     ;;
- esac
- 
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nc-config" >&5
--$as_echo_n "checking for nc-config... " >&6; }
--
--if nc-config --version > /dev/null 2>&1; then
--      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--      OCTCDF_LIBS="$OCTCDF_LIBS `nc-config --libs`"
--      OCTCDF_CFLAGS="$OCTCDF_CFLAGS `nc-config --cflags`"
--      HAVE_NETCDF=yes
--else
--      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nc-dap" >&5
--$as_echo_n "checking for nc-dap... " >&6; }
--
--      if ncdap-config --version > /dev/null 2>&1; then
--            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--            OCTCDF_LIBS="$OCTCDF_LIBS `ncdap-config --libs`"
--            OCTCDF_CFLAGS="$OCTCDF_CFLAGS `ncdap-config --cflags`"
--
--            HAVE_NETCDF=yes
--      else
--            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nc_open in -lnetcdf" >&5
--$as_echo_n "checking for nc_open in -lnetcdf... " >&6; }
--if ${ac_cv_lib_netcdf_nc_open+:} false; then :
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}nc-config", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}nc-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_NC_CONFIG+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lnetcdf  $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char nc_open ();
--int
--main ()
--{
--return nc_open ();
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_netcdf_nc_open=yes
--else
--  ac_cv_lib_netcdf_nc_open=no
--fi
--rm -f core conftest.err conftest.$ac_objext \
--    conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_netcdf_nc_open" >&5
--$as_echo "$ac_cv_lib_netcdf_nc_open" >&6; }
--if test "x$ac_cv_lib_netcdf_nc_open" = xyes; then :
--  HAVE_NETCDF=yes
-+  if test -n "$NC_CONFIG"; then
-+  ac_cv_prog_NC_CONFIG="$NC_CONFIG" # Let the user override the test.
- else
--  HAVE_NETCDF=no
--fi
--
--
--            if test $HAVE_NETCDF = yes ; then
--              OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf"
--
--
--              ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
--$as_echo_n "checking how to run the C preprocessor... " >&6; }
--# On Suns, sometimes $CPP names a directory.
--if test -n "$CPP" && test -d "$CPP"; then
--  CPP=
--fi
--if test -z "$CPP"; then
--  if ${ac_cv_prog_CPP+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--      # Double quotes because CPP needs to be expanded
--    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
--    do
--      ac_preproc_ok=false
--for ac_c_preproc_warn_flag in '' yes
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
- do
--  # Use a header file that comes with gcc, so configuring glibc
--  # with a fresh cross-compiler works.
--  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--  # <limits.h> exists even on freestanding compilers.
--  # On the NeXT, cc -E runs the code through the compiler's parser,
--  # not just through cpp. "Syntax error" is here to catch this case.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--		     Syntax error
--_ACEOF
--if ac_fn_c_try_cpp "$LINENO"; then :
--
--else
--  # Broken: fails on valid input.
--continue
--fi
--rm -f conftest.err conftest.i conftest.$ac_ext
--
--  # OK, works on sane cases.  Now check whether nonexistent headers
--  # can be detected and how.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <ac_nonexistent.h>
--_ACEOF
--if ac_fn_c_try_cpp "$LINENO"; then :
--  # Broken: success on invalid input.
--continue
--else
--  # Passes both tests.
--ac_preproc_ok=:
--break
--fi
--rm -f conftest.err conftest.i conftest.$ac_ext
--
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_NC_CONFIG="${ac_tool_prefix}nc-config"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
- done
--# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.i conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then :
--  break
--fi
--
--    done
--    ac_cv_prog_CPP=$CPP
-+  done
-+IFS=$as_save_IFS
- 
- fi
--  CPP=$ac_cv_prog_CPP
--else
--  ac_cv_prog_CPP=$CPP
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
--$as_echo "$CPP" >&6; }
--ac_preproc_ok=false
--for ac_c_preproc_warn_flag in '' yes
--do
--  # Use a header file that comes with gcc, so configuring glibc
--  # with a fresh cross-compiler works.
--  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--  # <limits.h> exists even on freestanding compilers.
--  # On the NeXT, cc -E runs the code through the compiler's parser,
--  # not just through cpp. "Syntax error" is here to catch this case.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--		     Syntax error
--_ACEOF
--if ac_fn_c_try_cpp "$LINENO"; then :
--
--else
--  # Broken: fails on valid input.
--continue
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
--
--  # OK, works on sane cases.  Now check whether nonexistent headers
--  # can be detected and how.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <ac_nonexistent.h>
--_ACEOF
--if ac_fn_c_try_cpp "$LINENO"; then :
--  # Broken: success on invalid input.
--continue
-+NC_CONFIG=$ac_cv_prog_NC_CONFIG
-+if test -n "$NC_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NC_CONFIG" >&5
-+$as_echo "$NC_CONFIG" >&6; }
- else
--  # Passes both tests.
--ac_preproc_ok=:
--break
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
--rm -f conftest.err conftest.i conftest.$ac_ext
- 
--done
--# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.i conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then :
- 
--else
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details" "$LINENO" 5; }
- fi
--
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
--$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
--if ${ac_cv_path_GREP+:} false; then :
-+if test -z "$ac_cv_prog_NC_CONFIG"; then
-+  ac_ct_NC_CONFIG=$NC_CONFIG
-+  # Extract the first word of "nc-config", so it can be a program name with args.
-+set dummy nc-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_ac_ct_NC_CONFIG+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test -z "$GREP"; then
--  ac_path_GREP_found=false
--  # Loop through the user's path and test for each of PROGNAME-LIST
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    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"
--      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
--*GNU*)
--  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
--*)
--  ac_count=0
--  $as_echo_n 0123456789 >"conftest.in"
--  while :
--  do
--    cat "conftest.in" "conftest.in" >"conftest.tmp"
--    mv "conftest.tmp" "conftest.in"
--    cp "conftest.in" "conftest.nl"
--    $as_echo 'GREP' >> "conftest.nl"
--    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
--    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    as_fn_arith $ac_count + 1 && ac_count=$as_val
--    if test $ac_count -gt ${ac_path_GREP_max-0}; then
--      # Best one so far, save it but keep looking for a better one
--      ac_cv_path_GREP="$ac_path_GREP"
--      ac_path_GREP_max=$ac_count
--    fi
--    # 10*(2^10) chars as input seems more than enough
--    test $ac_count -gt 10 && break
--  done
--  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
--esac
--
--      $ac_path_GREP_found && break 3
--    done
--  done
--  done
--IFS=$as_save_IFS
--  if test -z "$ac_cv_path_GREP"; then
--    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
--  fi
--else
--  ac_cv_path_GREP=$GREP
--fi
--
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
--$as_echo "$ac_cv_path_GREP" >&6; }
-- GREP="$ac_cv_path_GREP"
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
--$as_echo_n "checking for egrep... " >&6; }
--if ${ac_cv_path_EGREP+:} false; then :
--  $as_echo_n "(cached) " >&6
-+  if test -n "$ac_ct_NC_CONFIG"; then
-+  ac_cv_prog_ac_ct_NC_CONFIG="$ac_ct_NC_CONFIG" # Let the user override the test.
- else
--  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
--   then ac_cv_path_EGREP="$GREP -E"
--   else
--     if test -z "$EGREP"; then
--  ac_path_EGREP_found=false
--  # Loop through the user's path and test for each of PROGNAME-LIST
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+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_prog in egrep; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
--      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
--      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
--*GNU*)
--  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
--*)
--  ac_count=0
--  $as_echo_n 0123456789 >"conftest.in"
--  while :
--  do
--    cat "conftest.in" "conftest.in" >"conftest.tmp"
--    mv "conftest.tmp" "conftest.in"
--    cp "conftest.in" "conftest.nl"
--    $as_echo 'EGREP' >> "conftest.nl"
--    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
--    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    as_fn_arith $ac_count + 1 && ac_count=$as_val
--    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
--      # Best one so far, save it but keep looking for a better one
--      ac_cv_path_EGREP="$ac_path_EGREP"
--      ac_path_EGREP_max=$ac_count
--    fi
--    # 10*(2^10) chars as input seems more than enough
--    test $ac_count -gt 10 && break
--  done
--  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
--esac
--
--      $ac_path_EGREP_found && break 3
--    done
--  done
-+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_prog_ac_ct_NC_CONFIG="nc-config"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-   done
- IFS=$as_save_IFS
--  if test -z "$ac_cv_path_EGREP"; then
--    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
--  fi
--else
--  ac_cv_path_EGREP=$EGREP
--fi
--
--   fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
--$as_echo "$ac_cv_path_EGREP" >&6; }
-- EGREP="$ac_cv_path_EGREP"
--
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
--$as_echo_n "checking for ANSI C header files... " >&6; }
--if ${ac_cv_header_stdc+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <stdlib.h>
--#include <stdarg.h>
--#include <string.h>
--#include <float.h>
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  ac_cv_header_stdc=yes
--else
--  ac_cv_header_stdc=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--
--if test $ac_cv_header_stdc = yes; then
--  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <string.h>
--
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "memchr" >/dev/null 2>&1; then :
--
--else
--  ac_cv_header_stdc=no
- fi
--rm -f conftest*
--
- fi
--
--if test $ac_cv_header_stdc = yes; then
--  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <stdlib.h>
--
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "free" >/dev/null 2>&1; then :
--
-+ac_ct_NC_CONFIG=$ac_cv_prog_ac_ct_NC_CONFIG
-+if test -n "$ac_ct_NC_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NC_CONFIG" >&5
-+$as_echo "$ac_ct_NC_CONFIG" >&6; }
- else
--  ac_cv_header_stdc=no
--fi
--rm -f conftest*
--
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
--if test $ac_cv_header_stdc = yes; then
--  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
--  if test "$cross_compiling" = yes; then :
--  :
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <ctype.h>
--#include <stdlib.h>
--#if ((' ' & 0x0FF) == 0x020)
--# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
--#else
--# define ISLOWER(c) \
--		   (('a' <= (c) && (c) <= 'i') \
--		     || ('j' <= (c) && (c) <= 'r') \
--		     || ('s' <= (c) && (c) <= 'z'))
--# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
--#endif
--
--#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
--int
--main ()
--{
--  int i;
--  for (i = 0; i < 256; i++)
--    if (XOR (islower (i), ISLOWER (i))
--	|| toupper (i) != TOUPPER (i))
--      return 2;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
-+  if test "x$ac_ct_NC_CONFIG" = x; then
-+    NC_CONFIG="nc-config"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$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
-+    NC_CONFIG=$ac_ct_NC_CONFIG
-+  fi
- else
--  ac_cv_header_stdc=no
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
--fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
--$as_echo "$ac_cv_header_stdc" >&6; }
--if test $ac_cv_header_stdc = yes; then
--
--$as_echo "#define STDC_HEADERS 1" >>confdefs.h
--
--fi
--
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
--		  inttypes.h stdint.h unistd.h
--do :
--  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
--"
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
-+  NC_CONFIG="$ac_cv_prog_NC_CONFIG"
- fi
- 
--done
--
- 
--ac_fn_c_check_header_mongrel "$LINENO" "netcdf.h" "ac_cv_header_netcdf_h" "$ac_includes_default"
--if test "x$ac_cv_header_netcdf_h" = xyes; then :
--  HAVE_NETCDF=yes
-+OCTCDF_LIBS="$OCTCDF_LIBS `$NC_CONFIG --libs`"
-+OCTCDF_CFLAGS="$OCTCDF_CFLAGS `$NC_CONFIG --cflags`"
-+if test -z "$NC_CONFIG"; then
-+as_fn_error 1 "nc-config not found" "$LINENO" 5;
- else
--  HAVE_NETCDF=no
--fi
--
--
--            fi
--      fi
-+ HAVE_NETCDF=yes
- fi
- 
- 
-@@ -3820,6 +3195,7 @@
- octave-forge is configured with
-    octave:      $OCTAVE (version $OCTAVE_VERSION)
-    mkoctfile:	$MKOCTFILE for Octave $subver
-+   octave-config: $OCTAVE_CONFIG for Octave $subver
-    octcdf toolbox: $OCTCDFSTATUS
-    netCDF compiler flags: $OCTCDF_CFLAGS
-    netCDF libraries: $OCTCDF_LIBS"
-diff -ur octcdf.orig/src/configure.base octcdf/src/configure.base
---- octcdf.orig/src/configure.base	2015-04-14 11:21:17.161247377 -0400
-+++ octcdf/src/configure.base	2015-04-14 11:22:37.730853787 -0400
-@@ -50,6 +50,9 @@
- AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile)
- test -z "$MKOCTFILE" &&	AC_MSG_WARN([no mkoctfile found on path])
- 
-+AC_CHECK_PROG(OCTAVE_CONFIG,octave-config,octave-config)
-+test -z "$OCTAVE_CONFIG" &&	AC_MSG_WARN([no octave-config found on path])
-+
- AC_SUBST(ver)
- AC_SUBST(subver)
- AC_SUBST(mpath)
-@@ -267,15 +270,22 @@
- fi
- ])
- 
-+AC_DEFUN(OCTAVE_CONFIG_EVAL,
-+[AC_MSG_CHECKING([for $1 in octave-config])
-+$2=`$OCTAVE_CONFIG -p $1`
-+AC_MSG_RESULT($$2)
-+AC_SUBST($2)
-+])
-+
- dnl should check that $(OCTAVE) --version matches $(MKOCTFILE) --version
- AC_CHECK_PROG(OCTAVE,octave,octave)
--OCTAVE_EVAL(OCTAVE_VERSION,OCTAVE_VERSION)
-+OCTAVE_CONFIG_EVAL(VERSION,OCTAVE_VERSION)
- 
- dnl grab canonical host type so we can write system specific install stuff
--OCTAVE_EVAL(octave_config_info('canonical_host_type'),canonical_host_type)
-+OCTAVE_CONFIG_EVAL(CANONICAL_HOST_TYPE,canonical_host_type)
- 
- dnl grab SHLEXT from octave config
--OCTAVE_EVAL(octave_config_info('SHLEXT'),SHLEXT)
-+OCTAVE_CONFIG_EVAL(SHLEXT,SHLEXT)
- 
- AC_PROG_LN_S
- 
-@@ -308,44 +318,17 @@
-     ;;
- esac
- 
--dnl first checking for nc-config, then nc-dap 
--
--AC_MSG_CHECKING([for nc-config])
-+dnl check for nc-config
-+AC_CHECK_TOOL(NC_CONFIG, nc-config, nc-config)
- 
--if nc-config --version > /dev/null 2>&1; then
--      AC_MSG_RESULT([yes])
--      OCTCDF_LIBS="$OCTCDF_LIBS `nc-config --libs`"
--      OCTCDF_CFLAGS="$OCTCDF_CFLAGS `nc-config --cflags`"
--      HAVE_NETCDF=yes
-+OCTCDF_LIBS="$OCTCDF_LIBS `$NC_CONFIG --libs`"
-+OCTCDF_CFLAGS="$OCTCDF_CFLAGS `$NC_CONFIG --cflags`"
-+if test -z "$NC_CONFIG"; then
-+AC_MSG_ERROR([nc-config not found], 1);
- else
--      AC_MSG_RESULT([no])          
--      AC_MSG_CHECKING([for nc-dap])
--
--      if ncdap-config --version > /dev/null 2>&1; then
--            AC_MSG_RESULT([yes])
--            OCTCDF_LIBS="$OCTCDF_LIBS `ncdap-config --libs`"
--            OCTCDF_CFLAGS="$OCTCDF_CFLAGS `ncdap-config --cflags`"
--
--            HAVE_NETCDF=yes
--      else
--            AC_MSG_RESULT([no])          
--
--            dnl if no opendap, checking if the NetCDF library exists. 
--	    dnl AC_CHECK_LIB takes the value of LDFLAGS into account
--
--            AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,)
--
--            if test $HAVE_NETCDF = yes ; then
--              OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf"
--
--              dnl we have the libraries, no we have also the headers?
--	      dnl AC_CHECK_HEADER takes the value of CPPFLAGS into account
--
--              AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no)
--            fi
--      fi
-+ HAVE_NETCDF=yes
- fi
--
-+ 
- AC_SUBST(HAVE_NETCDF)
- AC_SUBST(OCTCDF_LIBS)
- AC_SUBST(OCTCDF_CFLAGS)
-@@ -375,6 +358,7 @@
- octave-forge is configured with
-    octave:      $OCTAVE (version $OCTAVE_VERSION)
-    mkoctfile:	$MKOCTFILE for Octave $subver
-+   octave-config: $OCTAVE_CONFIG for Octave $subver
-    octcdf toolbox: $OCTCDFSTATUS
-    netCDF compiler flags: $OCTCDF_CFLAGS
-    netCDF libraries: $OCTCDF_LIBS"
-diff -ur octcdf.orig/src/Makeconf.in octcdf/src/Makeconf.in
---- octcdf.orig/src/Makeconf.in	2015-04-14 11:21:17.161247377 -0400
-+++ octcdf/src/Makeconf.in	2015-04-14 11:21:33.423571620 -0400
-@@ -53,6 +53,8 @@
- OCTAVE_VERSION = @OCTAVE_VERSION@
- MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v
- SHLEXT = @SHLEXT@
-+NC_CONFIG = @NC_CONFIG@
-+OCTAVE_CONFIG = @OCTAVE_CONFIG@
- 
- HAVE_NETCDF=@HAVE_NETCDF@
- OCTCDF_LIBS=@OCTCDF_LIBS@
-diff -ur octcdf.orig/src/configure octcdf/src/configure
---- octcdf.orig/src/configure	2015-11-25 08:22:54.216927907 -0500
-+++ octcdf/src/configure	2015-11-25 08:43:20.679996250 -0500
-@@ -2887,6 +2887,11 @@
- 
- 
- 
-+oct_ver=`echo $OCTAVE_VERSION | sed -e "s/\.//" -e "s/\..*$//"`
-+if test "$oct_ver" -ge "40" ; then
-+   OCTCDF_CFLAGS="$OCTCDF_CFLAGS -DOV_REP_TYPE=octave_base_value"
-+fi
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CANONICAL_HOST_TYPE in octave-config" >&5
- $as_echo_n "checking for CANONICAL_HOST_TYPE in octave-config... " >&6; }
- canonical_host_type=`$OCTAVE_CONFIG -p CANONICAL_HOST_TYPE`
-diff -ur octcdf.orig/src/configure.base octcdf/src/configure.base
---- octcdf.orig/src/configure.base	2015-11-25 08:22:54.215927888 -0500
-+++ octcdf/src/configure.base	2015-11-25 08:43:05.311695338 -0500
-@@ -281,6 +281,11 @@
- AC_CHECK_PROG(OCTAVE,octave,octave)
- OCTAVE_CONFIG_EVAL(VERSION,OCTAVE_VERSION)
- 
-+oct_ver=`echo $OCTAVE_VERSION | sed -e "s/\.//" -e "s/\..*$//"`
-+if test "$ocvt_ver" -ge "40" ; then
-+   OCTCDF_CFLAGS="$OCTCDF_CFLAGS -DOV_REP_TYPE=octave_base_value"
-+fi
-+
- dnl grab canonical host type so we can write system specific install stuff
- OCTAVE_CONFIG_EVAL(CANONICAL_HOST_TYPE,canonical_host_type)
- 
diff -r 4970d27d3e12 -r 6a33c32796b2 src/of-octcdf.mk
--- a/src/of-octcdf.mk	Sat Mar 19 10:00:08 2016 -0400
+++ b/src/of-octcdf.mk	Sat Mar 19 10:05:23 2016 -0400
@@ -5,8 +5,8 @@
 
 PKG             := of-octcdf
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.1.8
-$(PKG)_CHECKSUM := 0550e4d5741d5e720d6ad8a42edc8c1a451f07e5
+$(PKG)_VERSION  := 1.1.10
+$(PKG)_CHECKSUM := 96efa6d45fe79480d7de090e759f19d8324cfd21
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := octcdf
 $(PKG)_FILE     := octcdf-$($(PKG)_VERSION).tar.gz