From ab17122a5abea491501e195ca995c42ed0dc218e Mon Sep 17 00:00:00 2001
From: Quentin Rodier <quentin.rodier@meteo.fr>
Date: Mon, 3 Jan 2022 17:03:14 +0100
Subject: [PATCH] Quentin 03/01/2022: ncl and NetCDF library path adapted for
CNRM Ubuntu Aruba 20.04
---
src/Makefile.MESONH.mk | 4 ++--
src/configure | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Makefile.MESONH.mk b/src/Makefile.MESONH.mk
index 72a5827a7..7e99233a2 100644
--- a/src/Makefile.MESONH.mk
+++ b/src/Makefile.MESONH.mk
@@ -648,8 +648,8 @@ endif
#
ifeq "$(VER_CDF)" "CDFCTI"
CDF_PATH?=/usr
-INC_NETCDF = -I${CDF_PATH}/include
-LIB_NETCDF = -L${CDF_PATH}/lib64 -lnetcdff -lnetcdf -lhdf5_hl -lhdf5 -lsz -lz
+INC_NETCDF ?= $(shell nf-config --fflags)
+LIB_NETCDF ?= $(shell nf-config --flibs)
INC += $(INC_NETCDF)
LIBS += $(LIB_NETCDF)
endif
diff --git a/src/configure b/src/configure
index c0845c0d5..450f9c2ca 100755
--- a/src/configure
+++ b/src/configure
@@ -347,7 +347,7 @@ export CC=gcc
export OPTLEVEL=${OPTLEVEL:-DEBUG}
export MVWORK=${MVWORK:-NO}
export VER_CDF=${VER_CDF:-CDFCTI}
- export NEED_NCARG=${NEED_NCARG:-NO}
+ export NEED_NCARG=${NEED_NCARG:-YES}
export NEED_TOOLS=NO
;;
'Linux nuwa'*)
--
GitLab