File use_system_netcdf.patch of Package libmesh

Overview Repositories Revisions Requests Users Attributes Meta

File use_system_netcdf.patch of Package libmesh

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 <<<])

Places

File use_system_netcdf.patch of Package libmesh

Places