Commit ef1ecf7c authored by Ralf Mueller's avatar Ralf Mueller
Browse files

Skip configuration with external CDI bindings

Instead, CDI functionality can be build into CDI
* by build, link + install a shared CDI library
* by linking to CDI object files directly
Both is done from the libcdi subproject directory (refs #492)
parent 2c2ba2fd
## Process this file with automake to produce Makefile.in
SUBDIRS =
if USE_INTERNAL_CDI
SUBDIRS += libcdi
endif
SUBDIRS += src contrib
# Process this file with automake to produce Makefile.in
SUBDIRS = libcdi src contrib
#
EXTRA_DIST=config/default OPERATORS doc/cdo.pdf doc/cdo_refcard.pdf cdo.spec
#
......
......@@ -33,7 +33,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@USE_INTERNAL_CDI_TRUE@am__append_1 = libcdi
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/cdo.settings.in \
......@@ -71,7 +70,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = libcdi src contrib
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -118,9 +117,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CDI_C_INCLUDE = @CDI_C_INCLUDE@
CDI_C_LIB = @CDI_C_LIB@
CDI_LDFLAGS = @CDI_LDFLAGS@
CFLAGS = @CFLAGS@
CLDFLAGS = @CLDFLAGS@
CLIBS = @CLIBS@
......@@ -140,6 +136,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_CDI_SHARED = @ENABLE_CDI_SHARED@
ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
......@@ -160,7 +157,6 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTERNAL_CDI = @INTERNAL_CDI@
JASPER_LDFLAGS = @JASPER_LDFLAGS@
LD = @LD@
LDFLAGS = @LDFLAGS@
......@@ -256,7 +252,9 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = $(am__append_1) src contrib
# Process this file with automake to produce Makefile.in
SUBDIRS = libcdi src contrib
#
EXTRA_DIST = config/default OPERATORS doc/cdo.pdf doc/cdo_refcard.pdf cdo.spec
#
......
......@@ -18,9 +18,7 @@
"RANLIB" : "@RANLIB@",
"INSTALL" : "@INSTALL@",
"cdi" : {
"use_internal_cdi" : @INTERNAL_CDI@,
"lib" : "@CDI_C_LIB@",
"include" : "@CDI_C_INCLUDE@"
"enable_cdi_shared" : @ENABLE_CDI_SHARED@
},
"threads" : {
"lib" : "@THREADS_LDFLAGS@",
......
......@@ -4,7 +4,7 @@
Name: cdo
#BuildRequires:
Version: 1.4.5
Version: 1.4.6
Release: 1
Summary: Climate Data Operators
License: GNU GENERAL PUBLIC LICENSE Version 2, June 1991
......
......@@ -614,12 +614,9 @@ CLIBS
CLDFLAGS
FCFLAGS
subdirs
INTERNAL_CDI
USE_INTERNAL_CDI_FALSE
USE_INTERNAL_CDI_TRUE
CDI_LDFLAGS
CDI_C_INCLUDE
CDI_C_LIB
ENABLE_CDI_SHARED
ENABLE_CDI_SHARED_FALSE
ENABLE_CDI_SHARED_TRUE
PROJ_INCLUDE
PROJ_LDFLAGS
ENABLE_IEG
......@@ -779,7 +776,7 @@ enable_service
enable_extra
enable_ieg
with_proj
with_cdi
enable_cdi_shared
'
ac_precious_vars='build_alias
host_alias
......@@ -1426,6 +1423,8 @@ Optional Features:
--enable-service Use the service library [default=yes]
--enable-extra Use the extra library [default=yes]
--enable-ieg Use the ieg library [default=yes]
--enable-cdi-shared Build, install and link CDO with a shared CDI
library [default=no]
 
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
......@@ -1455,9 +1454,6 @@ Optional Packages:
--with-jasper-root
--with-proj=<directory> Specify location of PROJ library for cartographic
projections.
--with-cdi=<yes|no|directory>
Use external installation of the CDI library
[default=no]
 
Some influential environment variables:
CC C compiler command
......@@ -17912,182 +17908,48 @@ $as_echo "suppressed" >&6; }
fi
 
# ----------------------------------------------------------------------
# Compile with CDI: external installation or provided by this CDO package
# Compile with CDI
INTERNAL_CDI_DIR=libcdi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cdi library" >&5
$as_echo_n "checking for cdi library... " >&6; }
# Check whether --with-cdi was given.
if test "${with_cdi+set}" = set; then :
withval=$with_cdi;
else
with_cdi=no
fi
case $with_cdi in #(
no) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: suppressed. Use internal CDI from '$INTERNAL_CDI_DIR'" >&5
$as_echo "suppressed. Use internal CDI from '$INTERNAL_CDI_DIR'" >&6; } ;; #(
yes) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: in default directory" >&5
$as_echo "in default directory" >&6; }
for ac_header in cdi.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "cdi.h" "ac_cv_header_cdi_h" "$ac_includes_default"
if test "x$ac_cv_header_cdi_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_CDI_H 1
_ACEOF
fi
done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cdiPrintVersion in -lcdi" >&5
$as_echo_n "checking for cdiPrintVersion in -lcdi... " >&6; }
if test "${ac_cv_lib_cdi_cdiPrintVersion+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcdi $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char cdiPrintVersion ();
int
main ()
{
return cdiPrintVersion ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_cdi_cdiPrintVersion=yes
else
ac_cv_lib_cdi_cdiPrintVersion=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cdi_cdiPrintVersion" >&5
$as_echo "$ac_cv_lib_cdi_cdiPrintVersion" >&6; }
if test "x$ac_cv_lib_cdi_cdiPrintVersion" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCDI 1
_ACEOF
LIBS="-lcdi $LIBS"
fi
;; #(
*) :
CDI_ROOT=$with_cdi
SavedLDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$CDI_ROOT/lib"
CPPFLAGS="$CPPFLAGS -I$CDI_ROOT/include"
CDI_C_LIB="$LDFLAGS"
CDI_C_INCLUDE="$CPPFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: in $CDI_ROOT" >&5
$as_echo "in $CDI_ROOT" >&6; }
ac_fn_c_check_header_mongrel "$LINENO" "cdi.h" "ac_cv_header_cdi_h" "$ac_includes_default"
if test "x$ac_cv_header_cdi_h" = x""yes; then :
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cdiPrintVersion" >&5
$as_echo_n "checking for library containing cdiPrintVersion... " >&6; }
if test "${ac_cv_search_cdiPrintVersion+set}" = set; then :
$as_echo_n "(cached) " >&6
# At the moment, there are two possible CDI bindgins
# (default) linking directly to CDI's object files in ./libcdi/src
# (--enable-cdi-shared) build and link to a shared CDI library
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for building shared cdi bindings" >&5
$as_echo_n "checking for building shared cdi bindings... " >&6; }
# Check whether --enable-cdi-shared was given.
if test "${enable_cdi_shared+set}" = set; then :
enableval=$enable_cdi_shared; if test "x$enable_cdi_shared" == "xno"; then :
enable_cdi_shared=no
else
ac_func_search_save_LIBS=$LIBS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char cdiPrintVersion ();
int
main ()
{
return cdiPrintVersion ();
;
return 0;
}
_ACEOF
for ac_lib in '' cdi; do
if test -z "$ac_lib"; then
ac_res="none required"
else
ac_res=-l$ac_lib
LIBS="-l$ac_lib $CDI_LDFLAGS $ac_func_search_save_LIBS"
fi
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_search_cdiPrintVersion=$ac_res
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext
if test "${ac_cv_search_cdiPrintVersion+set}" = set; then :
break
enable_cdi_shared=yes
fi
done
if test "${ac_cv_search_cdiPrintVersion+set}" = set; then :
else
ac_cv_search_cdiPrintVersion=no
fi
rm conftest.$ac_ext
LIBS=$ac_func_search_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_cdiPrintVersion" >&5
$as_echo "$ac_cv_search_cdiPrintVersion" >&6; }
ac_res=$ac_cv_search_cdiPrintVersion
if test "$ac_res" != no; then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
enable_cdi_shared=no
fi
 
LDFLAGS="$LDFLAGS" ;; #(
*) :
;;
esac
if test x$with_cdi = 'xno'; then
USE_INTERNAL_CDI_TRUE=
USE_INTERNAL_CDI_FALSE='#'
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_cdi_shared" >&5
$as_echo "$enable_cdi_shared" >&6; }
# save CDI binding mode for later automake use
if test x$enable_cdi_shared = 'xyes'; then
ENABLE_CDI_SHARED_TRUE=
ENABLE_CDI_SHARED_FALSE='#'
else
USE_INTERNAL_CDI_TRUE='#'
USE_INTERNAL_CDI_FALSE=
ENABLE_CDI_SHARED_TRUE='#'
ENABLE_CDI_SHARED_FALSE=
fi
 
if test x$with_cdi = 'xno'; then :
INTERNAL_CDI=true
# create shell variables for the representation of configure results
if test x$enable_cdi_shared = 'xno'; then :
ENABLE_CDI_SHARED=false
 
else
INTERNAL_CDI=false
ENABLE_CDI_SHARED=true
 
fi
# ----------------------------------------------------------------------
# scan libcdi for CDI as a subproject
 
 
if test x$with_cdi = "xno"; then :
subdirs="$subdirs libcdi"
subdirs="$subdirs libcdi"
 
fi
# ----------------------------------------------------------------------
 
 
......@@ -18216,8 +18078,8 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${USE_INTERNAL_CDI_TRUE}" && test -z "${USE_INTERNAL_CDI_FALSE}"; then
as_fn_error $? "conditional \"USE_INTERNAL_CDI\" was never defined.
if test -z "${ENABLE_CDI_SHARED_TRUE}" && test -z "${ENABLE_CDI_SHARED_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_CDI_SHARED\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
 
......
......@@ -126,34 +126,24 @@ AC_ARG_WITH([proj],
[AC_MSG_CHECKING([for the PROJ library])
AC_MSG_RESULT([suppressed])])
# ----------------------------------------------------------------------
# Compile with CDI: external installation or provided by this CDO package
# Compile with CDI
INTERNAL_CDI_DIR=libcdi
AC_MSG_CHECKING([for cdi library])
AC_ARG_WITH([cdi],
[AC_HELP_STRING([--with-cdi=<yes|no|directory>],
[Use external installation of the CDI library [default=no]])],
[],
[with_cdi=no])
AS_CASE([$with_cdi],
[no],[AC_MSG_RESULT([suppressed. Use internal CDI from '$INTERNAL_CDI_DIR'])],
[yes],[AC_MSG_RESULT([in default directory])
AC_CHECK_HEADERS([cdi.h])
AC_CHECK_LIB([cdi],[cdiPrintVersion])],
[*],[CDI_ROOT=$with_cdi
SavedLDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$CDI_ROOT/lib"
CPPFLAGS="$CPPFLAGS -I$CDI_ROOT/include"
AC_SUBST([CDI_C_LIB],["$LDFLAGS"])
AC_SUBST([CDI_C_INCLUDE],["$CPPFLAGS"])
AC_MSG_RESULT([in $CDI_ROOT])
AC_CHECK_HEADER([cdi.h])
AC_SEARCH_LIBS([cdiPrintVersion],[cdi],,,[$CDI_LDFLAGS])
AC_SUBST([CDI_LDFLAGS])
LDFLAGS="$LDFLAGS"])
AM_CONDITIONAL([USE_INTERNAL_CDI],[test x$with_cdi = 'xno'])
AS_IF([test x$with_cdi = 'xno'],[AC_SUBST([INTERNAL_CDI],[true])],[AC_SUBST([INTERNAL_CDI],[false])])
# ----------------------------------------------------------------------
AS_IF([test x$with_cdi = "xno"],[AC_CONFIG_SUBDIRS([libcdi])],[])
# At the moment, there are two possible CDI bindgins
# (default) linking directly to CDI's object files in ./libcdi/src
# (--enable-cdi-shared) build and link to a shared CDI library
AC_MSG_CHECKING([for building shared cdi bindings])
AC_ARG_ENABLE([cdi-shared],
[AS_HELP_STRING([--enable-cdi-shared],[Build, install and link CDO with a shared CDI library [default=no]])],
[AS_IF([test "x$enable_cdi_shared" == "xno"],
[enable_cdi_shared=no],
[enable_cdi_shared=yes])],[enable_cdi_shared=no])
AC_MSG_RESULT([$enable_cdi_shared])
# save CDI binding mode for later automake use
AM_CONDITIONAL([ENABLE_CDI_SHARED],[test x$enable_cdi_shared = 'xyes'])
# create shell variables for the representation of configure results
AS_IF([test x$enable_cdi_shared = 'xno'],[AC_SUBST([ENABLE_CDI_SHARED],[false])],[AC_SUBST([ENABLE_CDI_SHARED],[true])])
# scan libcdi for CDI as a subproject
AC_CONFIG_SUBDIRS([libcdi])
# ----------------------------------------------------------------------
AC_SUBST([CPPFLAGS])
AC_SUBST([FCFLAGS])
......
......@@ -60,9 +60,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CDI_C_INCLUDE = @CDI_C_INCLUDE@
CDI_C_LIB = @CDI_C_LIB@
CDI_LDFLAGS = @CDI_LDFLAGS@
CFLAGS = @CFLAGS@
CLDFLAGS = @CLDFLAGS@
CLIBS = @CLIBS@
......@@ -82,6 +79,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_CDI_SHARED = @ENABLE_CDI_SHARED@
ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
......@@ -102,7 +100,6 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTERNAL_CDI = @INTERNAL_CDI@
JASPER_LDFLAGS = @JASPER_LDFLAGS@
LD = @LD@
LDFLAGS = @LDFLAGS@
......
......@@ -254,13 +254,57 @@ cdo_SOURCES += Arith.c \
cdo_LDADD =
cdo_CPPFLAGS =
if USE_INTERNAL_CDI
cdo_CPPFLAGS += -I$(top_srcdir)/libcdi/src
if ENABLE_CDI_SHARED
cdo_LDADD += $(top_builddir)/libcdi/src/libcdi.la
else
cdo_LDADD += @CDI_LDFLAGS@
cdo_LDADD += $(top_srcdir)/libcdi/src/basetime.lo \
$(top_srcdir)/libcdi/src/binary.lo \
$(top_srcdir)/libcdi/src/calendar.lo \
$(top_srcdir)/libcdi/src/cdf_int.lo \
$(top_srcdir)/libcdi/src/cdf.lo \
$(top_srcdir)/libcdi/src/cdi_error.lo \
$(top_srcdir)/libcdi/src/cdiFortran.lo \
$(top_srcdir)/libcdi/src/cdi_util.lo \
$(top_srcdir)/libcdi/src/cgribexlib.lo \
$(top_srcdir)/libcdi/src/dmemory.lo \
$(top_srcdir)/libcdi/src/error.lo \
$(top_srcdir)/libcdi/src/extralib.lo \
$(top_srcdir)/libcdi/src/file.lo \
$(top_srcdir)/libcdi/src/gaussgrid.lo \
$(top_srcdir)/libcdi/src/gribapi.lo \
$(top_srcdir)/libcdi/src/grid.lo \
$(top_srcdir)/libcdi/src/ieglib.lo \
$(top_srcdir)/libcdi/src/institution.lo \
$(top_srcdir)/libcdi/src/model.lo \
$(top_srcdir)/libcdi/src/servicelib.lo \
$(top_srcdir)/libcdi/src/stream_cdf.lo \
$(top_srcdir)/libcdi/src/stream_cgribex.lo \
$(top_srcdir)/libcdi/src/stream_ext.lo \
$(top_srcdir)/libcdi/src/stream_grb.lo \
$(top_srcdir)/libcdi/src/stream_gribapi.lo \
$(top_srcdir)/libcdi/src/stream_history.lo \
$(top_srcdir)/libcdi/src/stream_ieg.lo \
$(top_srcdir)/libcdi/src/stream_int.lo \
$(top_srcdir)/libcdi/src/stream.lo \
$(top_srcdir)/libcdi/src/stream_record.lo \
$(top_srcdir)/libcdi/src/stream_srv.lo \
$(top_srcdir)/libcdi/src/stream_var.lo \
$(top_srcdir)/libcdi/src/swap.lo \
$(top_srcdir)/libcdi/src/table.lo \
$(top_srcdir)/libcdi/src/taxis.lo \
$(top_srcdir)/libcdi/src/timebase.lo \
$(top_srcdir)/libcdi/src/tsteps.lo \
$(top_srcdir)/libcdi/src/util.lo \
$(top_srcdir)/libcdi/src/varscan.lo \
$(top_srcdir)/libcdi/src/version.lo \
$(top_srcdir)/libcdi/src/vlist.lo \
$(top_srcdir)/libcdi/src/vlist_att.lo \
$(top_srcdir)/libcdi/src/vlist_var.lo \
$(top_srcdir)/libcdi/src/zaxis.lo
endif
cdo_LDADD += @NETCDF_LDFLAGS@ \
cdo_LDADD += @NETCDF_LDFLAGS@ \
@HDF5_LDFLAGS@ \
@GRIB_API_LDFLAGS@ \
@ZLIB_LDFLAGS@ \
......
......@@ -35,9 +35,52 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = cdo$(EXEEXT)
@USE_INTERNAL_CDI_TRUE@am__append_1 = -I$(top_srcdir)/libcdi/src
@USE_INTERNAL_CDI_TRUE@am__append_2 = $(top_builddir)/libcdi/src/libcdi.la
@USE_INTERNAL_CDI_FALSE@am__append_3 = @CDI_LDFLAGS@
@ENABLE_CDI_SHARED_TRUE@am__append_1 = $(top_builddir)/libcdi/src/libcdi.la
@ENABLE_CDI_SHARED_FALSE@am__append_2 = $(top_srcdir)/libcdi/src/basetime.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/binary.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/calendar.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/cdf_int.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/cdf.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/cdi_error.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/cdiFortran.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/cdi_util.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/cgribexlib.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/dmemory.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/error.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/extralib.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/file.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/gaussgrid.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/gribapi.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/grid.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/ieglib.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/institution.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/model.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/servicelib.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/stream_cdf.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/stream_cgribex.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/stream_ext.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/stream_grb.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/stream_gribapi.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/stream_history.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/stream_ieg.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/stream_int.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/stream.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/stream_record.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/stream_srv.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/stream_var.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/swap.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/table.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/taxis.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/timebase.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/tsteps.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/util.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/varscan.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/version.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/vlist.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/vlist_att.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/vlist_var.lo \
@ENABLE_CDI_SHARED_FALSE@ $(top_srcdir)/libcdi/src/zaxis.lo
noinst_PROGRAMS = cdotest$(EXEEXT)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
......@@ -156,12 +199,11 @@ am_cdo_OBJECTS = cdo-cdo.$(OBJEXT) cdo-Arith.$(OBJEXT) \
cdo-table.$(OBJEXT) cdo-timer.$(OBJEXT) cdo-userlog.$(OBJEXT) \
cdo-util.$(OBJEXT) cdo-vinterp.$(OBJEXT) cdo-zaxis.$(OBJEXT)
cdo_OBJECTS = $(am_cdo_OBJECTS)
am__DEPENDENCIES_1 =
cdo_DEPENDENCIES = $(am__append_2) $(am__DEPENDENCIES_1)
cdo_DEPENDENCIES = $(am__append_1) $(am__append_2)
am_cdotest_OBJECTS = cdotest-cdotest.$(OBJEXT)
cdotest_OBJECTS = $(am_cdotest_OBJECTS)
am__DEPENDENCIES_2 = $(am__append_2) $(am__DEPENDENCIES_1)
cdotest_DEPENDENCIES = $(am__DEPENDENCIES_2)
am__DEPENDENCIES_1 = $(am__append_1) $(am__append_2)
cdotest_DEPENDENCIES = $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
......@@ -190,9 +232,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CDI_C_INCLUDE = @CDI_C_INCLUDE@
CDI_C_LIB = @CDI_C_LIB@
CDI_LDFLAGS = @CDI_LDFLAGS@
CFLAGS = @CFLAGS@
CLDFLAGS = @CLDFLAGS@
CLIBS = @CLIBS@
......@@ -212,6 +251,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_CDI_SHARED = @ENABLE_CDI_SHARED@
ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
......@@ -232,7 +272,6 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
INTERNAL_CDI = @INTERNAL_CDI@
JASPER_LDFLAGS = @JASPER_LDFLAGS@
LD = @LD@
LDFLAGS = @LDFLAGS@
......@@ -374,10 +413,10 @@ cdo_SOURCES = cdo.c Arith.c Arithc.c Arithdays.c Arithlat.c CDItest.c \
remaplib.c specspace.c specspace.h statistic.c statistic.h \
table.c timebase.h timer.c userlog.c util.c util.h vinterp.c \
vinterp.h zaxis.c
cdo_LDADD = $(am__append_2) $(am__append_3) @NETCDF_LDFLAGS@ \
cdo_LDADD = $(am__append_1) $(am__append_2) @NETCDF_LDFLAGS@ \
@HDF5_LDFLAGS@ @GRIB_API_LDFLAGS@ @ZLIB_LDFLAGS@ \
@SZLIB_LDFLAGS@ @PROJ_LDFLAGS@ @LDFLAGS@ @LIBS@ $(am__empty)
cdo_CPPFLAGS = $(am__append_1)
cdo_CPPFLAGS = -I$(top_srcdir)/libcdi/src
cdotest_SOURCES = cdo_int.h \
cdotest.c
......
......@@ -6,9 +6,6 @@
/* Compiler version */
#undef COMP_VERSION
/* Define to 1 if you have the <cdi.h> header file. */
#undef HAVE_CDI_H
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
......@@ -36,9 +33,6 @@
/* Define to 1 if you have the <jasper.h> header file. */
#undef HAVE_JASPER_H
/* Define to 1 if you have the `cdi' library (-lcdi). */
#undef HAVE_LIBCDI
/* Define to 1 for GRIB1 decoding/encoding with cgribex */
#undef HAVE_LIBCGRIBEX
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment