diff --git a/src/Makefile.MESONH.mk b/src/Makefile.MESONH.mk index 72a5827a7f72fce43c57c373f3a00eadac2a000d..7e99233a2fc6af6ae1e525a5da2cf25a390f4e88 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 c0845c0d5f5e52acd0d7cca1d31c9316e03c1c79..450f9c2ca241923e3eb3b4d7960aa232182e8ce1 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'*)