Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
a9eec05d
Commit
a9eec05d
authored
Jul 04, 2011
by
Thomas Jahns
🤸
Browse files
Rename HDF5_LDFLAGS to HDF5_LIBS and substitute it in pkgconfig file.
parent
3c3bee8d
Changes
11
Hide whitespace changes
Inline
Side-by-side
Makefile.in
View file @
a9eec05d
...
...
@@ -169,7 +169,7 @@ GREP = @GREP@
GRIB_API_INCLUDE
=
@GRIB_API_INCLUDE@
GRIB_API_LDFLAGS
=
@GRIB_API_LDFLAGS@
HDF5_INCLUDE
=
@HDF5_INCLUDE@
HDF5_L
DFLAG
S
=
@HDF5_L
DFLAG
S@
HDF5_L
IB
S
=
@HDF5_L
IB
S@
HOST_NAME
=
@HOST_NAME@
INSTALL
=
@INSTALL@
INSTALL_DATA
=
@INSTALL_DATA@
...
...
app/Makefile.in
View file @
a9eec05d
...
...
@@ -147,7 +147,7 @@ GREP = @GREP@
GRIB_API_INCLUDE
=
@GRIB_API_INCLUDE@
GRIB_API_LDFLAGS
=
@GRIB_API_LDFLAGS@
HDF5_INCLUDE
=
@HDF5_INCLUDE@
HDF5_L
DFLAG
S
=
@HDF5_L
DFLAG
S@
HDF5_L
IB
S
=
@HDF5_L
IB
S@
HOST_NAME
=
@HOST_NAME@
INSTALL
=
@INSTALL@
INSTALL_DATA
=
@INSTALL_DATA@
...
...
cdi.settings.in
View file @
a9eec05d
...
...
@@ -37,7 +37,7 @@
"include" : "@SZLIB_INCLUDE@"
},
"hdf5" : {
"lib" : "@HDF5_L
DFLAG
S@",
"lib" : "@HDF5_L
IB
S@",
"include" : "@HDF5_INCLUDE@"
},
"netcdf" : {
...
...
configure
View file @
a9eec05d
...
...
@@ -651,8 +651,8 @@ JASPER_LDFLAGS
NC_CONFIG
NETCDF_INCLUDE
NETCDF_LDFLAGS
HDF5_LIBS
HDF5_INCLUDE
HDF5_LDFLAGS
SZLIB_LIBS
SZLIB_INCLUDE
ZLIB_LIBS
...
...
@@ -24816,6 +24816,7 @@ fi
# ----------------------------------------------------------------------
# Link application with HDF5 library, required for netcdf4
HDF5_INCLUDE=''
HDF5_LIBS=''
# Check whether --with-hdf5 was given.
if test "${with_hdf5+set}" = set; then :
...
...
@@ -24958,12 +24959,10 @@ $as_echo "$as_me: Cannot find hdf5 high level interface! It is required for netC
have_hdf5_hl=no
fi
if test "x$have_libhdf5_hl" = 'xyes'; then :
HDF5_LDFLAGS=" -lhdf5_hl -lhdf5"
if test "x$have_libhdf5_hl" = xyes; then :
HDF5_LIBS=" -lhdf5_hl -lhdf5"
else
HDF5_LDFLAGS=" -lhdf5"
HDF5_LIBS=" -lhdf5"
fi
;; #(
*) :
...
...
@@ -25110,11 +25109,9 @@ $as_echo "$as_me: Cannot link to hdf5 high level interface! It is required for n
fi
if test "x$have_libhdf5_hl" = 'xyes'; then :
HDF5_LDFLAGS=" -L$HDF5_ROOT/lib -lhdf5_hl -lhdf5"
HDF5_LIBS=" -L$HDF5_ROOT/lib -lhdf5_hl -lhdf5"
else
HDF5_LDFLAGS=" -L$HDF5_ROOT/lib -lhdf5"
HDF5_LIBS=" -L$HDF5_ROOT/lib -lhdf5"
fi
HDF5_INCLUDE=" -I$HDF5_ROOT/include"
else
...
...
@@ -25132,6 +25129,7 @@ $as_echo "suppressed" >&6; }
fi
# ----------------------------------------------------------------------
# Compile application with netcdf
...
...
examples/Makefile.in
View file @
a9eec05d
...
...
@@ -176,7 +176,7 @@ GREP = @GREP@
GRIB_API_INCLUDE
=
@GRIB_API_INCLUDE@
GRIB_API_LDFLAGS
=
@GRIB_API_LDFLAGS@
HDF5_INCLUDE
=
@HDF5_INCLUDE@
HDF5_L
DFLAG
S
=
@HDF5_L
DFLAG
S@
HDF5_L
IB
S
=
@HDF5_L
IB
S@
HOST_NAME
=
@HOST_NAME@
INSTALL
=
@INSTALL@
INSTALL_DATA
=
@INSTALL_DATA@
...
...
interfaces/Makefile.am
View file @
a9eec05d
...
...
@@ -18,15 +18,15 @@ noinst_PROGRAMS += CdiInfo
noinst_LTLIBRARIES
+=
libcdipp.la
endif
#
locallibs
=
$(top_builddir)
/src/.libs/libcdi.so @LTLIBOBJS@ @NETCDF_LDFLAGS@ @HDF5_L
DFLAG
S@ @SZLIB_LIBS@ @ZLIB_LIBS@
locallibs
=
$(top_builddir)
/src/.libs/libcdi.so @LTLIBOBJS@ @NETCDF_LDFLAGS@ @HDF5_L
IB
S@ @SZLIB_LIBS@ @ZLIB_LIBS@
libcdipp_la_SOURCES
=
cdi.cpp cdi.hpp
libcdipp_la_LIBADD
=
$(top_builddir)
/src/libcdi.la
libcdipp_la_LDFLAGS
=
@NETCDF_LDFLAGS@ @HDF5_L
DFLAG
S@ @SZLIB_LIBS@ @ZLIB_LIBS@
$(LDFLAGS)
libcdipp_la_LDFLAGS
=
@NETCDF_LDFLAGS@ @HDF5_L
IB
S@ @SZLIB_LIBS@ @ZLIB_LIBS@
$(LDFLAGS)
CdiInfo_SOURCES
=
CdiInfo.cpp
CdiInfo_LDADD
=
libcdipp.la
CdiInfo_LDFLAGS
=
@NETCDF_LDFLAGS@ @HDF5_L
DFLAG
S@ @SZLIB_LIBS@ @ZLIB_LIBS@
$(LDFLAGS)
CdiInfo_LDFLAGS
=
@NETCDF_LDFLAGS@ @HDF5_L
IB
S@ @SZLIB_LIBS@ @ZLIB_LIBS@
$(LDFLAGS)
#
#
if
ENABLE_RUBY
...
...
interfaces/Makefile.in
View file @
a9eec05d
...
...
@@ -164,7 +164,7 @@ GREP = @GREP@
GRIB_API_INCLUDE
=
@GRIB_API_INCLUDE@
GRIB_API_LDFLAGS
=
@GRIB_API_LDFLAGS@
HDF5_INCLUDE
=
@HDF5_INCLUDE@
HDF5_L
DFLAG
S
=
@HDF5_L
DFLAG
S@
HDF5_L
IB
S
=
@HDF5_L
IB
S@
HOST_NAME
=
@HOST_NAME@
INSTALL
=
@INSTALL@
INSTALL_DATA
=
@INSTALL_DATA@
...
...
@@ -288,13 +288,13 @@ EXTRA_DIST = $(SWIGCDIOBJ) $(SWIGCDILIB) ruby/cdilib_wrap.c \
python/testObj.py
noinst_LTLIBRARIES
=
$(am__append_3)
#
locallibs
=
$(top_builddir)
/src/.libs/libcdi.so @LTLIBOBJS@ @NETCDF_LDFLAGS@ @HDF5_L
DFLAG
S@ @SZLIB_LIBS@ @ZLIB_LIBS@
locallibs
=
$(top_builddir)
/src/.libs/libcdi.so @LTLIBOBJS@ @NETCDF_LDFLAGS@ @HDF5_L
IB
S@ @SZLIB_LIBS@ @ZLIB_LIBS@
libcdipp_la_SOURCES
=
cdi.cpp cdi.hpp
libcdipp_la_LIBADD
=
$(top_builddir)
/src/libcdi.la
libcdipp_la_LDFLAGS
=
@NETCDF_LDFLAGS@ @HDF5_L
DFLAG
S@ @SZLIB_LIBS@ @ZLIB_LIBS@
$(LDFLAGS)
libcdipp_la_LDFLAGS
=
@NETCDF_LDFLAGS@ @HDF5_L
IB
S@ @SZLIB_LIBS@ @ZLIB_LIBS@
$(LDFLAGS)
CdiInfo_SOURCES
=
CdiInfo.cpp
CdiInfo_LDADD
=
libcdipp.la
CdiInfo_LDFLAGS
=
@NETCDF_LDFLAGS@ @HDF5_L
DFLAG
S@ @SZLIB_LIBS@ @ZLIB_LIBS@
$(LDFLAGS)
CdiInfo_LDFLAGS
=
@NETCDF_LDFLAGS@ @HDF5_L
IB
S@ @SZLIB_LIBS@ @ZLIB_LIBS@
$(LDFLAGS)
#
AM_CPPFLAGS
=
-I
$(top_srcdir)
/src
#
...
...
m4/acx_options.m4
View file @
a9eec05d
...
...
@@ -85,6 +85,7 @@ AC_SUBST([SZLIB_LIBS])
# ----------------------------------------------------------------------
# Link application with HDF5 library, required for netcdf4
HDF5_INCLUDE=''
HDF5_LIBS=''
AC_ARG_WITH([hdf5],
[AS_HELP_STRING([--with-hdf5=<yes|no|directory> (default=no)],[location of hdf5 library, NETCDF4 requires hdf5 high level interface])],
[AS_CASE(["$with_hdf5"],
...
...
@@ -100,9 +101,9 @@ AC_ARG_WITH([hdf5],
[have_hdf5_hl=yes],
[AC_MSG_NOTICE([Cannot find hdf5 high level interface! It is required for netCDF4.])
have_hdf5_hl=no])
AS_IF([test "x$have_libhdf5_hl" =
'
xyes
'
],
[
AC_SUBST([HDF5_LDFLAGS],[
" -lhdf5_hl -lhdf5"]
)]
,
[
AC_SUBST([HDF5_LDFLAGS],[
" -lhdf5"])
])
AS_IF([test "x$have_libhdf5_hl" = xyes],
[
HDF5_LIBS=
" -lhdf5_hl -lhdf5"],
[
HDF5_LIBS=
" -lhdf5"])
],
[*],[HDF5_ROOT=$with_hdf5
AS_IF([test -d "$HDF5_ROOT"],
...
...
@@ -122,13 +123,14 @@ AC_ARG_WITH([hdf5],
specified with the --with-szlib option..])
have_hdf5_hl=no])
AS_IF([test "x$have_libhdf5_hl" = 'xyes'],
[
AC_SUBST([HDF5_LDFLAGS],[
" -L$HDF5_ROOT/lib -lhdf5_hl -lhdf5"]
)]
,
[
AC_SUBST([HDF5_LDFLAGS],[
" -L$HDF5_ROOT/lib -lhdf5"])
])
[
HDF5_LIBS=
" -L$HDF5_ROOT/lib -lhdf5_hl -lhdf5"],
[
HDF5_LIBS=
" -L$HDF5_ROOT/lib -lhdf5"])
HDF5_INCLUDE=" -I$HDF5_ROOT/include"],
[AC_MSG_NOTICE([$HDF5_ROOT is not a directory! HDF5 suppressed])])])],
[AC_MSG_CHECKING([for hdf5 library])
AC_MSG_RESULT([suppressed])])
AC_SUBST([HDF5_INCLUDE])
AC_SUBST([HDF5_LIBS])
# ----------------------------------------------------------------------
# Compile application with netcdf
AC_ARG_WITH([netcdf],
...
...
src/Makefile.in
View file @
a9eec05d
...
...
@@ -170,7 +170,7 @@ GREP = @GREP@
GRIB_API_INCLUDE
=
@GRIB_API_INCLUDE@
GRIB_API_LDFLAGS
=
@GRIB_API_LDFLAGS@
HDF5_INCLUDE
=
@HDF5_INCLUDE@
HDF5_L
DFLAG
S
=
@HDF5_L
DFLAG
S@
HDF5_L
IB
S
=
@HDF5_L
IB
S@
HOST_NAME
=
@HOST_NAME@
INSTALL
=
@INSTALL@
INSTALL_DATA
=
@INSTALL_DATA@
...
...
src/pkgconfig/cdi.pc.in
View file @
a9eec05d
...
...
@@ -4,7 +4,7 @@ libdir=@libdir@
includedir=@includedir@
cflags=-I@includedir@
fcflags=@FPP_INCOPT@@includedir@ @CDI_F90_INTERFACE_FCFLAGS@
libs=-L@libdir@ -lcdi @GRIB_API_LDFLAGS@ @JASPER_LDFLAGS@ @NETCDF_LDFLAGS@ @HDF5_L
DFLAG
S@ @SZLIB_LIBS@ @ZLIB_LIBS@ @THREADS_LIBS@
libs=-L@libdir@ -lcdi @GRIB_API_LDFLAGS@ @JASPER_LDFLAGS@ @NETCDF_LDFLAGS@ @HDF5_L
IB
S@ @SZLIB_LIBS@ @ZLIB_LIBS@ @THREADS_LIBS@
netcdf_root=@NETCDF_ROOT@
threads_libs=@THREADS_LIBS@
threads_cflags=@THREADS_INCLUDE@
...
...
@@ -13,6 +13,7 @@ zlib_libs=@ZLIB_LIBS@
szlib_cflags=@SZLIB_INCLUDE@
szlib_libs=@SZLIB_LIBS@
hdf5_cflags=@HDF5_INCLUDE@
hdf5_libs=@HDF5_LIBS@
Name: @PACKAGE_NAME@
Description: CDI is an Interface to access Climate and NWP model Data.
...
...
tests/Makefile.in
View file @
a9eec05d
...
...
@@ -133,7 +133,7 @@ GREP = @GREP@
GRIB_API_INCLUDE
=
@GRIB_API_INCLUDE@
GRIB_API_LDFLAGS
=
@GRIB_API_LDFLAGS@
HDF5_INCLUDE
=
@HDF5_INCLUDE@
HDF5_L
DFLAG
S
=
@HDF5_L
DFLAG
S@
HDF5_L
IB
S
=
@HDF5_L
IB
S@
HOST_NAME
=
@HOST_NAME@
INSTALL
=
@INSTALL@
INSTALL_DATA
=
@INSTALL_DATA@
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment