Fix incorrect detection and usage of netcdf_par.h during configure [Bug #9855].

fe40c2f1 · Uwe Schulzweida · 337c8dcd · fe40c2f1 · fe40c2f1
Commit fe40c2f1 authored Aug 16, 2020 by Uwe Schulzweida
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

ChangeLog ChangeLog +4 -0

configure.ac configure.ac +4 -3

No files found.
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
        * using CGRIBEX library version 1.9.5
 	* Version 1.9.9 released

+2020-08-16 Matthew Krupcale
+
+	* Fix incorrect detection and usage of netcdf_par.h during configure [Bug #9855]
+
 2020-08-09 Uwe Schulzweida

 	* Fix problem with GRIB2 key indicatorOfUnitForTimeRange [Bug #9846]

--- a/configure.ac
+++ b/configure.ac
@@ -227,12 +227,13 @@ main(int argc, char **argv)
           [HAVE_PARALLEL_NC4=1],
           [AC_MSG_WARN([The supplied netCDF library does not support MPI parallel invocations])],
           [AC_INCLUDES_DEFAULT
+@%:@include <netcdf.h>
 @%:@include <netcdf_par.h>])],
-        [AC_CHECK_DECL([MPI_Bcast],
-           [HAVE_PARALLEL_NC4=1],
           [AC_MSG_WARN([The supplied netCDF library does not support MPI parallel invocations])],
           [AC_INCLUDES_DEFAULT
-@%:@include <netcdf.h>])], [AC_INCLUDES_DEFAULT])
+@%:@ifdef HAVE_NETCDF_H
+@%:@include <netcdf.h>
+@%:@endif])
      dnl parallel netCDF support still requires ScalES-PPM and YAXT to
      dnl re-arrange the data when running with more than one collector
      PKG_CHECK_MODULES([PPM_CORE],[scales-ppm-core],