mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-02-23 16:59:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2641 from WardF/minor_cleanup.wif

Browse Source 
Cleaning up a few stray issues
This commit is contained in:
Ward Fisher 2023-02-27 16:49:50 -07:00 committed by GitHub
commit 05b82feec0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1222,7 +1222,7 @@ if test "x$enable_hdf5" = "xno" ; then
enable_dap4=no
fi
if test "x$ISOSX" = xyes && "x$have_libxml2" = xno ; then
if test "x$ISOSX" = xyes && test "x$have_libxml2" = xno ; then
AC_MSG_ERROR([Error: OSX requires libxml2 => --disable-dap4.])
enable_dap4=no
fi

2
dap4_test/Makefile.am
View File

@ -61,7 +61,7 @@ EXTRA_DIST = test_parse.sh test_meta.sh test_data.sh \
CLEANFILES = *.exe
# This should only be left behind if using parallel io
CLEANFILES += tmp_*
CLEANFILES += ${execdir}/baselinethredds/GOES16_CONUS_20170821_020218_0.47_1km_33.3N_91.4W.nc4.thredds
CLEANFILES += ${srcdir}/baselinethredds/GOES16_CONUS_20170821_020218_0.47_1km_33.3N_91.4W.nc4.thredds
DISTCLEANFILES = findtestserver4.c pingurl4.c

1
libdap4/d4parser.c
View File

@ -494,6 +494,7 @@ parseVlenField(NCD4parser* parser, NCD4node* container, ncxml_t xml, NCD4node**
if((ret = parseVariable(parser,container,x,&field)))
goto done;
}
if(field == NULL) {ret = NC_EBADTYPE; goto done;}
if(fieldp) *fieldp = field;
done:
return THROW(ret);