diff --git a/conf/profile_mesonh.ihm b/conf/profile_mesonh.ihm
index 8aa73ab4bcaab6a1f08be91a91d9741d00c88f21..5e95bd6fa7bd91555102a8a1401afd8d4c82d0bf 100755
--- a/conf/profile_mesonh.ihm
+++ b/conf/profile_mesonh.ihm
@@ -113,7 +113,7 @@ export XYZ="-\${ARCH}\${MNH_REAL:+\${MNH_REAL}}I\${MNH_INT}-\${VERSION_XYZ}\${VE
#[ "x\${VER_USER}" != "x" ] && export XYZ="\${XYZ}-\${VER_USER}"
# PATH to find tools like "makegen, etc ..."
export BIN_TOOLS=${BIN_TOOLS}
-export PATH=.:\$SRC_MESONH/bin:\$SRC_MESONH/exe:\$SRC_MESONH/bin_tools/\${BIN_TOOLS}:\$PATH
+export PATH=.:\$SRC_MESONH/bin:\$SRC_MESONH/exe:\$SRC_MESONH/bin_tools:\$SRC_MESONH/bin_tools/\${BIN_TOOLS}:\$PATH
#
# NCARG_ROOT : for use of graphic tools : diaprog
#
diff --git a/src/Makefile b/src/Makefile
index f96e03017c0aa955f8fbe0dd6751025eab134006..c826d9cceb3c33b513b1392a59f6d330d9407b68 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -340,7 +340,7 @@ cdf : $(CDF_INC)
$(CDF_INC) :
cd ${DIR_HDF} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --with-zlib=no \
FC="$(FC)" FCFLAGS="$(HDF_OPT)" CPPFLAGS="-DpgiFortran" ${HDF_CONF} && make && make install && $(MAKE) -j 1 clean
- cd ${DIR_CDF} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --disable-cxx --disable-f90 --disable-dap \
+ cd ${DIR_CDF} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 --disable-cxx --enable-f90 --disable-dap \
FC="$(FC)" FCFLAGS="$(NETCDF_OPT)" CPPFLAGS="-DpgiFortran ${INC_NETCDF}" ${CDF_CONF} LDFLAGS=" -L${CDF_PATH}/lib64" && make && make install && $(MAKE) -j 1 clean
cleanmaster : cleancdf
@@ -374,6 +374,11 @@ ifndef DO_COMP_USER
else
# ln -sf $(OBJDIR)/$(*F) $(SRC_MESONH)/exe/$(*F)-${ARCH_XYZ}-${VER_USER}
ln -sf $(OBJDIR)/$(*F) $(SRC_MESONH)/exe/$(*F)${XYZ}
+endif
+ifdef MNH_TOOLS
+ ln -sf $(OBJDIR)/LFI2CDF $(SRC_MESONH)/bin_tools/lfi2cdf
+ ln -sf $(OBJDIR)/LFI2CDF $(SRC_MESONH)/bin_tools/cdf2cdf
+ ln -sf $(OBJDIR)/LFI2CDF $(SRC_MESONH)/bin_tools/cdf2lfi
endif
rm -f $(SRC_MESONH)/exe/$(*F)_${ARCH_XYZ}~
diff --git a/src/Makefile.MESONH.mk b/src/Makefile.MESONH.mk
index 8ba6fff0066a37cb7376512208b5869255c1f519..f60e957894d62beb25a5e7b840630d1ac7d01f91 100644
--- a/src/Makefile.MESONH.mk
+++ b/src/Makefile.MESONH.mk
@@ -195,6 +195,17 @@ VPATH += $(DIR_FOREFIRE)
CPPFLAGS += -DMNH_FOREFIRE
endif
##########################################################
+# Source TOOLS #
+##########################################################
+ifdef MNH_TOOLS
+DIR_TOOLS += ../LIBTOOLS/tools/lfi2cdf/src
+INC_TOOLS += -I$(B)$(DIR_TOOLS)
+DIR_MASTER += $(DIR_TOOLS)
+INC += $(INC_TOOLS)
+VPATH += $(DIR_TOOLS)
+#CPPFLAGS += -DLOWMEM
+endif
+##########################################################
# Source MPIVIDE #
##########################################################
#
@@ -502,6 +513,9 @@ NSOURCE=8
PROG_LIST += MESONH LATLON_TO_XY PREP_IDEAL_CASE PREP_REAL_CASE PREP_PGD \
PREP_NEST_PGD SPAWNING DIAG PREP_SURFEX ZOOM_PGD SPECTRE \
MNH2LPDM
+ifdef MNH_TOOLS
+PROG_LIST += LFI2CDF
+endif
#endif
##########################################################
# #
diff --git a/src/Rules.AIX64.mk b/src/Rules.AIX64.mk
index 3b3f35dd9f310b98ec27b03a6025ee11f21f81a3..2f01b1feea50571f750cbf4d8cfef41bf1807f31 100644
--- a/src/Rules.AIX64.mk
+++ b/src/Rules.AIX64.mk
@@ -95,6 +95,12 @@ CPPFLAGS_MNH = -DAMAX1=MAX -DMNH
TARGET_GRIBEX=ibm_power4
CNAME_GRIBEX=""
#A64=A64
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+MNH_TOOLS = yes
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.BG.mk b/src/Rules.BG.mk
index a8910824816d98a831912d6fc8b450552c3ef760..0550b9115c5ef567e7e69e3df6104f2b2cf4f9cb 100644
--- a/src/Rules.BG.mk
+++ b/src/Rules.BG.mk
@@ -106,6 +106,12 @@ CPPFLAGS_MNH = -DAMAX1=MAX -DMNH
TARGET_GRIBEX=ibm_power4
CNAME_GRIBEX=""
#A64=A64
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+#MNH_TOOLS = no
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.BGQ.mk b/src/Rules.BGQ.mk
index 27073eda648fb59523beed5645c2cc55ccc0d48d..5f2c55f9e0b1d9ecbfc58770ca348df498a4881f 100644
--- a/src/Rules.BGQ.mk
+++ b/src/Rules.BGQ.mk
@@ -165,6 +165,11 @@ CNAME_GRIBEX=""
# Gribapi flags
GRIBAPI_CONF= --host=powerpc64-bgq-linux
#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+#MNH_TOOLS = no
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.LXNAGf95.mk b/src/Rules.LXNAGf95.mk
index ce5e5a0e64a18b39571da7f217f6b1494ca791b5..dcafcbf7e9b71c82d69bd4e54635241dd01c79d8 100644
--- a/src/Rules.LXNAGf95.mk
+++ b/src/Rules.LXNAGf95.mk
@@ -51,6 +51,12 @@ CPPFLAGS_MNH = -DMNH
#
TARGET_GRIBEX=linux
CNAME_GRIBEX=f95
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+MNH_TOOLS = yes
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.LXcray.mk b/src/Rules.LXcray.mk
index cb25144a82018d2c8dd30f6d15e7ed6950578b45..30fe868282ff56447f4d014fd1ae424bbd056589 100644
--- a/src/Rules.LXcray.mk
+++ b/src/Rules.LXcray.mk
@@ -98,6 +98,12 @@ endif
#
TARGET_GRIBEX=linux
CNAME_GRIBEX=_gfortran
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+MNH_TOOLS = yes
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.LXg95.mk b/src/Rules.LXg95.mk
index fc00eceed0e014028e2e716496bde4a5af72e9c5..853c252d5a2c6f2b253e0bd7f085f4f87329b8d9 100644
--- a/src/Rules.LXg95.mk
+++ b/src/Rules.LXg95.mk
@@ -75,6 +75,12 @@ CPPFLAGS_MNH = -DAINT=INT -DAMOD=MOD -DMNH
#
TARGET_GRIBEX=linux
CNAME_GRIBEX=g95
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+MNH_TOOLS = yes
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.LXgfortran.mk b/src/Rules.LXgfortran.mk
index 7cb87b2baa9bdab1c88c43110c8e7e22d4bf015e..6be97fa9e6e6213011a988b0b9716a6eb3fffbed 100644
--- a/src/Rules.LXgfortran.mk
+++ b/src/Rules.LXgfortran.mk
@@ -91,6 +91,12 @@ CNAME_GRIBEX=_gfortran
# Netcdf/HDF5 flags
#
HDF_CONF= CFLAGS=-std=c99
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+MNH_TOOLS = yes
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.LXifort.mk b/src/Rules.LXifort.mk
index 20156c3de55149531cdbea7bbb5570ccd172ee61..b218ca7aae6e23d5429bbf6acdf4ce67e669023f 100644
--- a/src/Rules.LXifort.mk
+++ b/src/Rules.LXifort.mk
@@ -126,6 +126,12 @@ endif
#
TARGET_GRIBEX=linux
CNAME_GRIBEX=ifort
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+MNH_TOOLS = yes
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.LXpathf95.mk b/src/Rules.LXpathf95.mk
index dc27a1248dffa4aa0f814ed57aa64416fa68c56e..4f1bc562356a698336168c1a1e7fae86f08d77b9 100644
--- a/src/Rules.LXpathf95.mk
+++ b/src/Rules.LXpathf95.mk
@@ -51,6 +51,12 @@ CPPFLAGS_MNH = -DAINT=INT -DAMOD=MOD -DMNH
#
TARGET_GRIBEX=linux
CNAME_GRIBEX=pathf95
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+MNH_TOOLS = yes
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.LXpgi.mk b/src/Rules.LXpgi.mk
index e1ab3e7e7976e73382ffd9f88eb3d6afd65fef34..abe9db6121fdadf6ce346feee1a8ac1471ae8429 100644
--- a/src/Rules.LXpgi.mk
+++ b/src/Rules.LXpgi.mk
@@ -109,7 +109,12 @@ CPPFLAGS_MNH = -DMNH -DMNH_PGI
#
TARGET_GRIBEX=linux
CNAME_GRIBEX=_pgf77
-
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+MNH_TOOLS = yes
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #
diff --git a/src/Rules.SX8.mk b/src/Rules.SX8.mk
index 48fd2ab69ebab12d171f59d764e2e3c3f88eab3c..959e93083589895eb32cc8c99e7bdf4f12445f36 100644
--- a/src/Rules.SX8.mk
+++ b/src/Rules.SX8.mk
@@ -97,6 +97,12 @@ CPPFLAGS_MNH = -DMNH
#ARCH_GRIBEX=NEC
TARGET_GRIBEX=NEC
CNAME_GRIBEX=sxmpif90
+#
+# LIBTOOLS flags
+#
+#if MNH_TOOLS exists => compile the tools
+#MNH_TOOLS = no
+#
##########################################################
# #
# Source of MESONH PACKAGE Distribution #