From c3b978de7d696397032b4986cf29abcfa88eb37c Mon Sep 17 00:00:00 2001
From: RobertSchoetter <robert.schoetter@meteo.fr>
Date: Mon, 25 Apr 2022 13:46:04 +0200
Subject: [PATCH] Bugfix for compilation on Ubuntu PC.
---
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 491b86725..11408518b 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 f0ac84bf5..5d0e38810 100755
--- a/src/configure
+++ b/src/configure
@@ -19,7 +19,7 @@ export VERSION_CDFCXX=${VERSION_CDFCXX:-"4.3.1"}
export VERSION_CDFF=${VERSION_CDFF:-"4.5.3"}
export VERSION_GRIBAPI=${VERSION_GRIBAPI:-"1.26.0-Source"}
export VERSION_ECCODES=${VERSION_ECCODES:-"2.18.0"}
-export ECCODES_DEFINITION_PATH=${ECCODES_DEFINITION_PATH:${SRC_MESONH}/src/LIB/eccodes-${VERSION_ECCODES}"/definitions/"}
+export ECCODES_DEFINITION_PATH=${ECCODES_DEFINITION_PATH:-${SRC_MESONH}/src/LIB/eccodes-${VERSION_ECCODES}/definitions/}
export MNH_INT=${MNH_INT:-"4"}
export LFI_INT=${LFI_INT:-8}
export MNH_REAL=${MNH_REAL:-"8"}
--
GitLab