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
ae717489
Commit
ae717489
authored
Jul 04, 2011
by
Thomas Jahns
🤸
Browse files
Rename SZLIB_LDFLAGS to SZLIB_LIBS and substitue in pkgconfig file.
parent
562268bf
Changes
11
Hide whitespace changes
Inline
Side-by-side
Makefile.in
View file @
ae717489
...
...
@@ -219,7 +219,7 @@ STRIP = @STRIP@
SWIG
=
@SWIG@
SYSTEM_TYPE
=
@SYSTEM_TYPE@
SZLIB_INCLUDE
=
@SZLIB_INCLUDE@
SZLIB_L
DFLAG
S
=
@SZLIB_L
DFLAG
S@
SZLIB_L
IB
S
=
@SZLIB_L
IB
S@
THREADS_INCLUDE
=
@THREADS_INCLUDE@
THREADS_LIBS
=
@THREADS_LIBS@
USER_NAME
=
@USER_NAME@
...
...
app/Makefile.in
View file @
ae717489
...
...
@@ -197,7 +197,7 @@ STRIP = @STRIP@
SWIG
=
@SWIG@
SYSTEM_TYPE
=
@SYSTEM_TYPE@
SZLIB_INCLUDE
=
@SZLIB_INCLUDE@
SZLIB_L
DFLAG
S
=
@SZLIB_L
DFLAG
S@
SZLIB_L
IB
S
=
@SZLIB_L
IB
S@
THREADS_INCLUDE
=
@THREADS_INCLUDE@
THREADS_LIBS
=
@THREADS_LIBS@
USER_NAME
=
@USER_NAME@
...
...
cdi.settings.in
View file @
ae717489
...
...
@@ -33,7 +33,7 @@
"include" : "@ZLIB_INCLUDE@",
},
"szlib" : {
"lib" : "@SZLIB_L
DFLAG
S@",
"lib" : "@SZLIB_L
IB
S@",
"include" : "@SZLIB_INCLUDE@"
},
"hdf5" : {
...
...
configure
View file @
ae717489
...
...
@@ -653,8 +653,8 @@ NETCDF_INCLUDE
NETCDF_LDFLAGS
HDF5_INCLUDE
HDF5_LDFLAGS
SZLIB_LIBS
SZLIB_INCLUDE
SZLIB_LDFLAGS
ZLIB_LIBS
ZLIB_INCLUDE
THREADS_LIBS
...
...
@@ -24634,6 +24634,7 @@ fi
# Compile application with SZLIB library, needed for GRIB1 or for
# linking against hdf5/netcdf4
SZLIB_INCLUDE=''
SZLIB_LIBS=''
# Check whether --with-szlib was given.
if test "${with_szlib+set}" = set; then :
...
...
@@ -24716,8 +24717,7 @@ else
as_fn_error $? "Could not link to szlib" "$LINENO" 5
fi
SZLIB_LDFLAGS=" -lsz"
;; #(
SZLIB_LIBS=" -lsz" ;; #(
*) :
SZLIB_ROOT=$with_szlib
if test -d "$SZLIB_ROOT"; then :
...
...
@@ -24795,8 +24795,7 @@ else
as_fn_error $? "Could not link to szlib" "$LINENO" 5
fi
SZLIB_LDFLAGS=" -L$SZLIB_ROOT/lib -lsz"
SZLIB_LIBS=" -L$SZLIB_ROOT/lib -lsz"
SZLIB_INCLUDE=" -I$SZLIB_ROOT/include"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: $SZLIB_ROOT is not a directory! SZLIB suppressed" >&5
...
...
@@ -24813,6 +24812,7 @@ $as_echo "suppressed" >&6; }
fi
# ----------------------------------------------------------------------
# Link application with HDF5 library, required for netcdf4
...
...
examples/Makefile.in
View file @
ae717489
...
...
@@ -226,7 +226,7 @@ STRIP = @STRIP@
SWIG
=
@SWIG@
SYSTEM_TYPE
=
@SYSTEM_TYPE@
SZLIB_INCLUDE
=
@SZLIB_INCLUDE@
SZLIB_L
DFLAG
S
=
@SZLIB_L
DFLAG
S@
SZLIB_L
IB
S
=
@SZLIB_L
IB
S@
THREADS_INCLUDE
=
@THREADS_INCLUDE@
THREADS_LIBS
=
@THREADS_LIBS@
USER_NAME
=
@USER_NAME@
...
...
interfaces/Makefile.am
View file @
ae717489
...
...
@@ -18,15 +18,15 @@ noinst_PROGRAMS += CdiInfo
noinst_LTLIBRARIES
+=
libcdipp.la
endif
#
locallibs
=
$(top_builddir)
/src/.libs/libcdi.so @LTLIBOBJS@ @NETCDF_LDFLAGS@ @HDF5_LDFLAGS@ @SZLIB_L
DFLAG
S@ @ZLIB_LIBS@
locallibs
=
$(top_builddir)
/src/.libs/libcdi.so @LTLIBOBJS@ @NETCDF_LDFLAGS@ @HDF5_LDFLAGS@ @SZLIB_L
IB
S@ @ZLIB_LIBS@
libcdipp_la_SOURCES
=
cdi.cpp cdi.hpp
libcdipp_la_LIBADD
=
$(top_builddir)
/src/libcdi.la
libcdipp_la_LDFLAGS
=
@NETCDF_LDFLAGS@ @HDF5_LDFLAGS@ @SZLIB_L
DFLAG
S@ @ZLIB_LIBS@
$(LDFLAGS)
libcdipp_la_LDFLAGS
=
@NETCDF_LDFLAGS@ @HDF5_LDFLAGS@ @SZLIB_L
IB
S@ @ZLIB_LIBS@
$(LDFLAGS)
CdiInfo_SOURCES
=
CdiInfo.cpp
CdiInfo_LDADD
=
libcdipp.la
CdiInfo_LDFLAGS
=
@NETCDF_LDFLAGS@ @HDF5_LDFLAGS@ @SZLIB_L
DFLAG
S@ @ZLIB_LIBS@
$(LDFLAGS)
CdiInfo_LDFLAGS
=
@NETCDF_LDFLAGS@ @HDF5_LDFLAGS@ @SZLIB_L
IB
S@ @ZLIB_LIBS@
$(LDFLAGS)
#
#
if
ENABLE_RUBY
...
...
interfaces/Makefile.in
View file @
ae717489
...
...
@@ -214,7 +214,7 @@ STRIP = @STRIP@
SWIG
=
@SWIG@
SYSTEM_TYPE
=
@SYSTEM_TYPE@
SZLIB_INCLUDE
=
@SZLIB_INCLUDE@
SZLIB_L
DFLAG
S
=
@SZLIB_L
DFLAG
S@
SZLIB_L
IB
S
=
@SZLIB_L
IB
S@
THREADS_INCLUDE
=
@THREADS_INCLUDE@
THREADS_LIBS
=
@THREADS_LIBS@
USER_NAME
=
@USER_NAME@
...
...
@@ -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_LDFLAGS@ @SZLIB_L
DFLAG
S@ @ZLIB_LIBS@
locallibs
=
$(top_builddir)
/src/.libs/libcdi.so @LTLIBOBJS@ @NETCDF_LDFLAGS@ @HDF5_LDFLAGS@ @SZLIB_L
IB
S@ @ZLIB_LIBS@
libcdipp_la_SOURCES
=
cdi.cpp cdi.hpp
libcdipp_la_LIBADD
=
$(top_builddir)
/src/libcdi.la
libcdipp_la_LDFLAGS
=
@NETCDF_LDFLAGS@ @HDF5_LDFLAGS@ @SZLIB_L
DFLAG
S@ @ZLIB_LIBS@
$(LDFLAGS)
libcdipp_la_LDFLAGS
=
@NETCDF_LDFLAGS@ @HDF5_LDFLAGS@ @SZLIB_L
IB
S@ @ZLIB_LIBS@
$(LDFLAGS)
CdiInfo_SOURCES
=
CdiInfo.cpp
CdiInfo_LDADD
=
libcdipp.la
CdiInfo_LDFLAGS
=
@NETCDF_LDFLAGS@ @HDF5_LDFLAGS@ @SZLIB_L
DFLAG
S@ @ZLIB_LIBS@
$(LDFLAGS)
CdiInfo_LDFLAGS
=
@NETCDF_LDFLAGS@ @HDF5_LDFLAGS@ @SZLIB_L
IB
S@ @ZLIB_LIBS@
$(LDFLAGS)
#
AM_CPPFLAGS
=
-I
$(top_srcdir)
/src
#
...
...
m4/acx_options.m4
View file @
ae717489
...
...
@@ -54,6 +54,7 @@ AC_SUBST([ZLIB_LIBS])
# Compile application with SZLIB library, needed for GRIB1 or for
# linking against hdf5/netcdf4
SZLIB_INCLUDE=''
SZLIB_LIBS=''
AC_ARG_WITH([szlib],
[AS_HELP_STRING([--with-szlib=<yes|no|directory> (default=no)],[location of szlib library, optional for GRIB1 and NETCDF4 compression])],
[AS_CASE(["$with_szlib"],
...
...
@@ -64,7 +65,7 @@ AC_ARG_WITH([szlib],
[sz],
[AC_DEFINE([HAVE_LIBSZ],[1],[Define to 1 for SZIP support])],
[AC_MSG_ERROR([Could not link to szlib])])
AC_SUBST([SZLIB_LDFLAGS],[
" -lsz"]
)]
,
SZLIB_LIBS=
" -lsz"],
[*],[SZLIB_ROOT=$with_szlib
AS_IF([test -d "$SZLIB_ROOT"],
[LDFLAGS="-L$SZLIB_ROOT/lib $LDFLAGS"
...
...
@@ -74,12 +75,13 @@ AC_ARG_WITH([szlib],
[sz],
[AC_DEFINE([HAVE_LIBSZ],[1],[Define to 1 for SZIP support])],
[AC_MSG_ERROR([Could not link to szlib])])
AC_SUBST([SZLIB_LDFLAGS],[
" -L$SZLIB_ROOT/lib -lsz"
])
SZLIB_LIBS=
" -L$SZLIB_ROOT/lib -lsz"
SZLIB_INCLUDE=" -I$SZLIB_ROOT/include"],
[AC_MSG_NOTICE([$SZLIB_ROOT is not a directory! SZLIB suppressed])])])],
[AC_MSG_CHECKING([for szlib library])
AC_MSG_RESULT([suppressed])])
AC_SUBST([SZLIB_INCLUDE])
AC_SUBST([SZLIB_LIBS])
# ----------------------------------------------------------------------
# Link application with HDF5 library, required for netcdf4
AC_ARG_WITH([hdf5],
...
...
src/Makefile.in
View file @
ae717489
...
...
@@ -220,7 +220,7 @@ STRIP = @STRIP@
SWIG
=
@SWIG@
SYSTEM_TYPE
=
@SYSTEM_TYPE@
SZLIB_INCLUDE
=
@SZLIB_INCLUDE@
SZLIB_L
DFLAG
S
=
@SZLIB_L
DFLAG
S@
SZLIB_L
IB
S
=
@SZLIB_L
IB
S@
THREADS_INCLUDE
=
@THREADS_INCLUDE@
THREADS_LIBS
=
@THREADS_LIBS@
USER_NAME
=
@USER_NAME@
...
...
src/pkgconfig/cdi.pc.in
View file @
ae717489
...
...
@@ -4,13 +4,14 @@ 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_LDFLAGS@ @SZLIB_L
DFLAG
S@ @ZLIB_LIBS@ @THREADS_LIBS@
libs=-L@libdir@ -lcdi @GRIB_API_LDFLAGS@ @JASPER_LDFLAGS@ @NETCDF_LDFLAGS@ @HDF5_LDFLAGS@ @SZLIB_L
IB
S@ @ZLIB_LIBS@ @THREADS_LIBS@
netcdf_root=@NETCDF_ROOT@
threads_libs=@THREADS_LIBS@
threads_cflags=@THREADS_INCLUDE@
zlib_cflags=@ZLIB_INCLUDE@
zlib_libs=@ZLIB_LIBS@
szlib_cflags=@SZLIB_INCLUDE@
szlib_libs=@SZLIB_LIBS@
Name: @PACKAGE_NAME@
Description: CDI is an Interface to access Climate and NWP model Data.
...
...
tests/Makefile.in
View file @
ae717489
...
...
@@ -183,7 +183,7 @@ STRIP = @STRIP@
SWIG
=
@SWIG@
SYSTEM_TYPE
=
@SYSTEM_TYPE@
SZLIB_INCLUDE
=
@SZLIB_INCLUDE@
SZLIB_L
DFLAG
S
=
@SZLIB_L
DFLAG
S@
SZLIB_L
IB
S
=
@SZLIB_L
IB
S@
THREADS_INCLUDE
=
@THREADS_INCLUDE@
THREADS_LIBS
=
@THREADS_LIBS@
USER_NAME
=
@USER_NAME@
...
...
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