Skip to content
Snippets Groups Projects
Commit b8faf348 authored by Thomas Jahns's avatar Thomas Jahns :cartwheel:
Browse files

Update netcdf_par.h test for newer netcdf libraries.

* For netcdf_c version 4.7 it's now mandatory to first include netcdf.h.
parent 064e07f3
No related branches found
No related tags found
Loading
......@@ -31204,12 +31204,15 @@ fi
CFLAGS="$CFLAGS $MPI_C_INCLUDE"
for ac_header in netcdf_par.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "netcdf_par.h" "ac_cv_header_netcdf_par_h" "$ac_includes_default"
ac_fn_c_check_header_compile "$LINENO" "netcdf_par.h" "ac_cv_header_netcdf_par_h" "$ac_includes_default
#include <netcdf.h>
"
if test "x$ac_cv_header_netcdf_par_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_NETCDF_PAR_H 1
_ACEOF
ac_fn_c_check_decl "$LINENO" "MPI_Bcast" "ac_cv_have_decl_MPI_Bcast" "$ac_includes_default
#include <netcdf.h>
#include <netcdf_par.h>
"
if test "x$ac_cv_have_decl_MPI_Bcast" = xyes; then :
......@@ -265,13 +265,15 @@ dnl test properties of MPI system
[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
@%:@include <netcdf.h>])
dnl if not both scales-ppm and yaxt are available, netcdf can only be
dnl used in serial mode
AS_IF([test x$enable_ppm != xyes],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment