Stefan Brüns
1c61d0f6bb
- Update to version 1.5.1 Too many changes to list here, see included NEWS file. - Rebase use_system_netcdf.patch - Cleanup spec file - Convert to _multibuild, add openmpi1/openmpi2/openmpi3 flavors OBS-URL: https://build.opensuse.org/request/show/762208 OBS-URL: https://build.opensuse.org/package/show/science/libmesh?expand=0&rev=3
44 lines
1.9 KiB
Diff
44 lines
1.9 KiB
Diff
diff --git a/m4/libmesh_optional_packages.m4 b/m4/libmesh_optional_packages.m4
|
|
index b33ed9d..6305ee7 100644
|
|
--- a/m4/libmesh_optional_packages.m4
|
|
+++ b/m4/libmesh_optional_packages.m4
|
|
@@ -610,7 +610,15 @@ AM_CONDITIONAL(LIBMESH_ENABLE_HDF5, test x$enablehdf5 = xyes)
|
|
# --------------------------------------------------------------
|
|
CONFIGURE_NETCDF
|
|
AS_IF([test $enablenetcdf = yes],
|
|
- [libmesh_contrib_INCLUDES="$NETCDF_INCLUDE $libmesh_contrib_INCLUDES"])
|
|
+ [
|
|
+ AS_IF([test x$netcdfversion = xsystem],
|
|
+ [
|
|
+ libmesh_optional_INCLUDES="$NETCDF_CFLAGS $libmesh_optional_INCLUDES"
|
|
+ libmesh_optional_LIBS="$NETCDF_LIBS $libmesh_optional_LIBS"
|
|
+ ],
|
|
+ [
|
|
+ libmesh_contrib_INCLUDES="$NETCDF_INCLUDE $libmesh_contrib_INCLUDES"])
|
|
+ ])
|
|
|
|
AM_CONDITIONAL(LIBMESH_ENABLE_NETCDF, test x$enablenetcdf = xyes)
|
|
AM_CONDITIONAL(LIBMESH_ENABLE_NETCDF_V4, test x$netcdfversion = x4)
|
|
diff --git a/m4/netcdf.m4 b/m4/netcdf.m4
|
|
index 698f753..01ff7e2 100644
|
|
--- a/m4/netcdf.m4
|
|
+++ b/m4/netcdf.m4
|
|
@@ -7,6 +7,8 @@ AC_DEFUN([CONFIGURE_NETCDF],
|
|
AS_HELP_STRING([--disable-netcdf],
|
|
[build without netCDF binary I/O]),
|
|
[AS_CASE("${enableval}",
|
|
+ [system], [enablenetcdf=yes
|
|
+ netcdfversion=system],
|
|
[yes|new|v4], [enablenetcdf=yes
|
|
netcdfversion=4],
|
|
[old|v3], [enablenetcdf=yes
|
|
@@ -27,6 +29,8 @@ AC_DEFUN([CONFIGURE_NETCDF],
|
|
])
|
|
|
|
AS_CASE("${netcdfversion}",
|
|
+ [system], [PKG_CHECK_MODULES([NETCDF], [netcdf >= 4.2])],
|
|
+
|
|
[3], [
|
|
dnl We shouldn't get here, see if test above.
|
|
AC_MSG_ERROR([>>> Error: netCDF3 is no longer distributed with libMesh <<<])
|