core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GRIB-435: NETCDF should only be a dependency for grib_to_netcdf

This commit is contained in:
Shahram Najm 2013-09-24 11:13:50 +01:00
parent ab5b69a0b7
commit a3fe5297d3
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -351,8 +351,11 @@ if test $netcdf_dir != 'none'
then then
with_netcdf=1 with_netcdf=1
CFLAGS="$CFLAGS -I${netcdf_dir}/include" CFLAGS="$CFLAGS -I${netcdf_dir}/include"
LDFLAGS="$LDFLAGS -L${netcdf_dir}/lib" NETCDF_LDFLAGS="-L${netcdf_dir}/lib -lnetcdf"
ORIG_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $NETCDF_LDFLAGS"
AC_CHECK_LIB(netcdf,nc_open,netcdf_ok=1,netcdf_ok=0) AC_CHECK_LIB(netcdf,nc_open,netcdf_ok=1,netcdf_ok=0)
LDFLAGS=$ORIG_LDFLAGS
if test $netcdf_ok -eq 0 if test $netcdf_ok -eq 0
then then
AC_MSG_NOTICE([ AC_MSG_NOTICE([
@ -365,7 +368,7 @@ then
test 0 -eq 1 test 0 -eq 1
exit exit
fi fi
LIBS="-lnetcdf $LIBS" AC_SUBST(NETCDF_LDFLAGS)
AC_DEFINE(HAVE_NETCDF,1,NETCDF enabled) AC_DEFINE(HAVE_NETCDF,1,NETCDF enabled)
fi fi

2
tools/Makefile.am
View File

@ -69,6 +69,8 @@ INCLUDES = -I$(top_builddir)/src
LDADD = libgrib_tools.la $(top_builddir)/src/libgrib_api.la LDADD = libgrib_tools.la $(top_builddir)/src/libgrib_api.la
DEPENDENCIES = $(LDADD) DEPENDENCIES = $(LDADD)
grib_to_netcdf_LDADD = $(LDADD) $(NETCDF_LDFLAGS)
## Make sure these will be cleaned even when they're not built by ## Make sure these will be cleaned even when they're not built by
## default. ## default.
CLEANFILES = libgrib_tools.la CLEANFILES = libgrib_tools.la