Commit 396f65c0 authored by Thomas Jahns's avatar Thomas Jahns 🤸 Committed by Fabian Wachsmann
Browse files

Add tests for UUID libraries.

* Needed for CMOR.
parent 51af5f9f
......@@ -6,6 +6,6 @@ endif
#
EXTRA_DIST=config/default OPERATORS doc/cdo.pdf doc/cdo_cmor.pdf doc/cdo_eca.pdf doc/cdo_magics.pdf doc/cdo_refcard.pdf cdo.spec README
#
ACLOCAL_AMFLAGS = -I m4
ACLOCAL_AMFLAGS = -I m4 -I libcdi/m4
#
CLEANFILES = `ls *~ 2> /dev/null`
......@@ -93,7 +93,12 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/config/missing \
$(top_srcdir)/config/tap-driver.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_cfortran_flags.m4 \
am__aclocal_m4_deps = $(top_srcdir)/libcdi/m4/acx_c_package.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_check_include.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_package.m4 \
$(top_srcdir)/libcdi/m4/acx_option_search_libs.m4 \
$(top_srcdir)/libcdi/m4/asx_tr_arg.m4 \
$(top_srcdir)/m4/acx_cfortran_flags.m4 \
$(top_srcdir)/m4/acx_check_cfortran.m4 \
$(top_srcdir)/m4/acx_options.m4 \
$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
......@@ -101,7 +106,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_cfortran_flags.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/acinclude.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_c_check_include.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
......@@ -302,6 +309,9 @@ NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPENMP_CFLAGS = @OPENMP_CFLAGS@
OSSP_UUIDROOT = @OSSP_UUIDROOT@
OSSP_UUID_C_INCLUDE = @OSSP_UUID_C_INCLUDE@
OSSP_UUID_C_LIB = @OSSP_UUID_C_LIB@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
......@@ -330,6 +340,10 @@ THREADS_LIBS = @THREADS_LIBS@
UDUNITS_INCLUDE = @UDUNITS_INCLUDE@
UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@
USER_NAME = @USER_NAME@
UTIL_LINUX_UUIDROOT = @UTIL_LINUX_UUIDROOT@
UTIL_LINUX_UUID_C_INCLUDE = @UTIL_LINUX_UUID_C_INCLUDE@
UTIL_LINUX_UUID_C_LIB = @UTIL_LINUX_UUID_C_LIB@
UUID_C_LIB = @UUID_C_LIB@
VERSION = @VERSION@
XML2_LIBS = @XML2_LIBS@
abs_builddir = @abs_builddir@
......@@ -395,7 +409,7 @@ SUBDIRS = libcdi src/lib/ncl src contrib test/data test \
#
EXTRA_DIST = config/default OPERATORS doc/cdo.pdf doc/cdo_cmor.pdf doc/cdo_eca.pdf doc/cdo_magics.pdf doc/cdo_refcard.pdf cdo.spec README
#
ACLOCAL_AMFLAGS = -I m4
ACLOCAL_AMFLAGS = -I m4 -I libcdi/m4
#
CLEANFILES = `ls *~ 2> /dev/null`
all: all-recursive
......
......@@ -91,6 +91,7 @@ dnl
dnl Code:
dnl
dnl
m4_include([libcdi/m4/acx_lang_c_check_include.m4])
dnl Local Variables:
dnl mode: autoconf
dnl license-project-url: "https://www.dkrz.de/redmine/projects/show/scales-ppm"
......
......@@ -1243,6 +1243,11 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([libcdi/m4/acx_c_package.m4])
m4_include([libcdi/m4/acx_lang_check_include.m4])
m4_include([libcdi/m4/acx_lang_package.m4])
m4_include([libcdi/m4/acx_option_search_libs.m4])
m4_include([libcdi/m4/asx_tr_arg.m4])
m4_include([m4/acx_cfortran_flags.m4])
m4_include([m4/acx_check_cfortran.m4])
m4_include([m4/acx_options.m4])
......
This diff is collapsed.
......@@ -11,6 +11,7 @@ AC_DEFINE_UNQUOTED(CDO, ["$PACKAGE_VERSION"], [CDO version])
CONFIG_ABORT=yes
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_MACRO_DIR([libcdi/m4])
AC_CANONICAL_HOST
AC_CANONICAL_BUILD
......@@ -196,6 +197,45 @@ CFLAGS="$CFLAGS ${OPENMP_CFLAGS}"
CXXFLAGS="$CXXFLAGS ${OPENMP_CFLAGS}"
# ----------------------------------------------------------------------
# -----------------------------------------------------------------------
# test for UUID libraries needed by CMOR
# (util-linux libuuid in 3.1.1 and before, OSSP UUID in 3.1.2 and after)
AC_ARG_ENABLE([util-linux-uuid],
[AS_HELP_STRING([--disable-util-linux-uuid],
[Do not test for the util-linux UUID library, use OSSP or DCE versions instead])],,
[enable_util_linux_uuid=auto])
AS_IF([test x"${enable_util_linux_uuid}" != xno],
[ACX_C_PACKAGE([util-linux-uuid],[uuid/uuid.h],,,[],
[uuid_generate],[[uuid]],,,[])])
AS_IF([test x"$have_util_linux_uuid_c_bindings" = xyes],
[CPPFLAGS="${CPPFLAGS+$CPPFLAGS }$UTIL_LINUX_UUID_C_INCLUDE"
UUID_C_LIB=$UTIL_LINUX_UUID_C_LIB],
[ACX_C_PACKAGE([ossp-uuid],[uuid.h],,[-I/usr/include/ossp],[],
[uuid_create],[[ossp-uuid]],,,[])
AS_IF([test x"$have_ossp_uuid_c_bindings" = xyes],
[CPPFLAGS_save=$CPPFLAGS
CPPFLAGS="${CPPFLAGS+$CPPFLAGS }$OSSP_UUID_C_INCLUDE"
UUID_C_LIB=$OSSP_UUID_C_LIB
AC_CHECK_HEADERS([uuid.h],
[AC_CHECK_DECLS([uuid_create],
[AC_CHECK_DECLS([UUID_MAKE_V5],,[have_ossp_uuid_c_bindings=no],
[AC_INCLUDES_DEFAULT
@%:@include <uuid.h>])],[have_ossp_uuid_c_bindings=no],
[AC_INCLUDES_DEFAULT
@%:@include <uuid.h>])],[have_ossp_uuid_c_bindings=no])
AS_IF([test x"$have_ossp_uuid_c_bindings" = xno],
[UUID_C_LIB=
CPPFLAGS=$CPPFLAGS_save])],
[AC_CHECK_LIB([uuid],[uuid_generate],
[AC_CHECK_DECLS([uuid_generate],
[UUID_C_LIB=-luuid],,[AC_INCLUDES_DEFAULT
@%:@include <uuid/uuid.h>])],
[AC_CHECK_FUNCS([uuid_create],
[AC_CHECK_DECLS([uuid_create],
[UUID_C_LIB=""],,[AC_INCLUDES_DEFAULT
@%:@include <uuid.h>])])])])])
AC_SUBST([UUID_C_LIB])
# Add configure options
ACX_OPTIONS
......
......@@ -81,7 +81,12 @@ subdir = contrib
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/config/mkinstalldirs COPYING
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_cfortran_flags.m4 \
am__aclocal_m4_deps = $(top_srcdir)/libcdi/m4/acx_c_package.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_check_include.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_package.m4 \
$(top_srcdir)/libcdi/m4/acx_option_search_libs.m4 \
$(top_srcdir)/libcdi/m4/asx_tr_arg.m4 \
$(top_srcdir)/m4/acx_cfortran_flags.m4 \
$(top_srcdir)/m4/acx_check_cfortran.m4 \
$(top_srcdir)/m4/acx_options.m4 \
$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
......@@ -89,7 +94,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_cfortran_flags.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/acinclude.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_c_check_include.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
......@@ -210,6 +217,9 @@ NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPENMP_CFLAGS = @OPENMP_CFLAGS@
OSSP_UUIDROOT = @OSSP_UUIDROOT@
OSSP_UUID_C_INCLUDE = @OSSP_UUID_C_INCLUDE@
OSSP_UUID_C_LIB = @OSSP_UUID_C_LIB@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
......@@ -238,6 +248,10 @@ THREADS_LIBS = @THREADS_LIBS@
UDUNITS_INCLUDE = @UDUNITS_INCLUDE@
UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@
USER_NAME = @USER_NAME@
UTIL_LINUX_UUIDROOT = @UTIL_LINUX_UUIDROOT@
UTIL_LINUX_UUID_C_INCLUDE = @UTIL_LINUX_UUID_C_INCLUDE@
UTIL_LINUX_UUID_C_LIB = @UTIL_LINUX_UUID_C_LIB@
UUID_C_LIB = @UUID_C_LIB@
VERSION = @VERSION@
XML2_LIBS = @XML2_LIBS@
abs_builddir = @abs_builddir@
......
......@@ -248,12 +248,15 @@ AC_ARG_WITH([cmor],
[*],[CMOR_ROOT=$with_cmor
AS_IF([test -d "$CMOR_ROOT"],
[LDFLAGS="$LDFLAGS -L$CMOR_ROOT/lib"
CPPFLAGS="$CPPFLAGS -I$CMOR_ROOT/include -I$CMOR_ROOT/include/cdTime"
LIBS_saved=$LIBS
LIBS="${LIBS+${LIBS} }$UUID_C_LIB"
CPPFLAGS="$CPPFLAGS -I$CMOR_ROOT/include -I$CMOR_ROOT/include/cdTime -I$CMOR_ROOT/include/json-c"
AC_SEARCH_LIBS([cmor_load_table],
[cmor],
[AC_DEFINE([HAVE_LIBCMOR],[1],[Define to 1 for CMOR support])],
[AC_MSG_ERROR([Could not link to cmor library!])])
CMOR_LIBS=" -L$CMOR_ROOT/lib -lcmor"],
CMOR_LIBS=" -L$CMOR_ROOT/lib -lcmor $UUID_C_LIB"
LIBS=$LIBS_saved],
[AC_MSG_ERROR([$CMOR_ROOT is not a directory! CMOR suppressed])])])],
[AC_MSG_CHECKING([for the CMOR library])
AC_MSG_RESULT([suppressed])])
......
......@@ -465,7 +465,8 @@ void *Expr(void *argument)
{
size_t ngp = params[varID].ngp;
size_t nlev = params[varID].nlev;
params[varID].data = (double*) Malloc(ngp*nlev*sizeof(double));
size_t nItems = MAX(4, ngp*nlev);
params[varID].data = (double*) Malloc(nItems*sizeof(double));
}
}
......@@ -473,7 +474,8 @@ void *Expr(void *argument)
{
size_t ngp = params[varID].ngp;
size_t nlev = params[varID].nlev;
params[varID].data = (double*) Malloc(ngp*nlev*sizeof(double));
size_t nItems = MAX(4, ngp*nlev);
params[varID].data = (double*) Malloc(nItems*sizeof(double));
}
for ( int i = 0; i < parse_arg.ncoords; i++ )
......
......@@ -89,7 +89,12 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(srcdir)/config.h.in $(top_srcdir)/config/mkinstalldirs \
$(top_srcdir)/config/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_cfortran_flags.m4 \
am__aclocal_m4_deps = $(top_srcdir)/libcdi/m4/acx_c_package.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_check_include.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_package.m4 \
$(top_srcdir)/libcdi/m4/acx_option_search_libs.m4 \
$(top_srcdir)/libcdi/m4/asx_tr_arg.m4 \
$(top_srcdir)/m4/acx_cfortran_flags.m4 \
$(top_srcdir)/m4/acx_check_cfortran.m4 \
$(top_srcdir)/m4/acx_options.m4 \
$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
......@@ -97,7 +102,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_cfortran_flags.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/acinclude.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_c_check_include.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
......@@ -454,6 +461,9 @@ NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPENMP_CFLAGS = @OPENMP_CFLAGS@
OSSP_UUIDROOT = @OSSP_UUIDROOT@
OSSP_UUID_C_INCLUDE = @OSSP_UUID_C_INCLUDE@
OSSP_UUID_C_LIB = @OSSP_UUID_C_LIB@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
......@@ -482,6 +492,10 @@ THREADS_LIBS = @THREADS_LIBS@
UDUNITS_INCLUDE = @UDUNITS_INCLUDE@
UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@
USER_NAME = @USER_NAME@
UTIL_LINUX_UUIDROOT = @UTIL_LINUX_UUIDROOT@
UTIL_LINUX_UUID_C_INCLUDE = @UTIL_LINUX_UUID_C_INCLUDE@
UTIL_LINUX_UUID_C_LIB = @UTIL_LINUX_UUID_C_LIB@
UUID_C_LIB = @UUID_C_LIB@
VERSION = @VERSION@
XML2_LIBS = @XML2_LIBS@
abs_builddir = @abs_builddir@
......
......@@ -43,6 +43,18 @@
*/
#undef HAVE_DECL_ISNAN
/* Define to 1 if you have the declaration of `uuid_create', and to 0 if you
don't. */
#undef HAVE_DECL_UUID_CREATE
/* Define to 1 if you have the declaration of `uuid_generate', and to 0 if you
don't. */
#undef HAVE_DECL_UUID_GENERATE
/* Define to 1 if you have the declaration of `UUID_MAKE_V5', and to 0 if you
don't. */
#undef HAVE_DECL_UUID_MAKE_V5
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
......@@ -235,6 +247,12 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to 1 if you have the `uuid_create' function. */
#undef HAVE_UUID_CREATE
/* Define to 1 if you have the <uuid.h> header file. */
#undef HAVE_UUID_H
/* Define to 1 if you have the <wordexp.h> header file. */
#undef HAVE_WORDEXP_H
......
......@@ -82,7 +82,12 @@ subdir = src/lib/ncl
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/config/mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_cfortran_flags.m4 \
am__aclocal_m4_deps = $(top_srcdir)/libcdi/m4/acx_c_package.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_check_include.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_package.m4 \
$(top_srcdir)/libcdi/m4/acx_option_search_libs.m4 \
$(top_srcdir)/libcdi/m4/asx_tr_arg.m4 \
$(top_srcdir)/m4/acx_cfortran_flags.m4 \
$(top_srcdir)/m4/acx_check_cfortran.m4 \
$(top_srcdir)/m4/acx_options.m4 \
$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
......@@ -90,7 +95,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_cfortran_flags.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/acinclude.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_c_check_include.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
......@@ -255,6 +262,9 @@ NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPENMP_CFLAGS = @OPENMP_CFLAGS@
OSSP_UUIDROOT = @OSSP_UUIDROOT@
OSSP_UUID_C_INCLUDE = @OSSP_UUID_C_INCLUDE@
OSSP_UUID_C_LIB = @OSSP_UUID_C_LIB@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
......@@ -283,6 +293,10 @@ THREADS_LIBS = @THREADS_LIBS@
UDUNITS_INCLUDE = @UDUNITS_INCLUDE@
UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@
USER_NAME = @USER_NAME@
UTIL_LINUX_UUIDROOT = @UTIL_LINUX_UUIDROOT@
UTIL_LINUX_UUID_C_INCLUDE = @UTIL_LINUX_UUID_C_INCLUDE@
UTIL_LINUX_UUID_C_LIB = @UTIL_LINUX_UUID_C_LIB@
UUID_C_LIB = @UUID_C_LIB@
VERSION = @VERSION@
XML2_LIBS = @XML2_LIBS@
abs_builddir = @abs_builddir@
......
......@@ -106,7 +106,12 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(srcdir)/Smooth.test.in $(srcdir)/MapReduce.test.in \
$(srcdir)/Ninfo.test.in README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_cfortran_flags.m4 \
am__aclocal_m4_deps = $(top_srcdir)/libcdi/m4/acx_c_package.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_check_include.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_package.m4 \
$(top_srcdir)/libcdi/m4/acx_option_search_libs.m4 \
$(top_srcdir)/libcdi/m4/asx_tr_arg.m4 \
$(top_srcdir)/m4/acx_cfortran_flags.m4 \
$(top_srcdir)/m4/acx_check_cfortran.m4 \
$(top_srcdir)/m4/acx_options.m4 \
$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
......@@ -114,7 +119,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_cfortran_flags.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/acinclude.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_c_check_include.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
......@@ -447,6 +454,9 @@ NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPENMP_CFLAGS = @OPENMP_CFLAGS@
OSSP_UUIDROOT = @OSSP_UUIDROOT@
OSSP_UUID_C_INCLUDE = @OSSP_UUID_C_INCLUDE@
OSSP_UUID_C_LIB = @OSSP_UUID_C_LIB@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
......@@ -475,6 +485,10 @@ THREADS_LIBS = @THREADS_LIBS@
UDUNITS_INCLUDE = @UDUNITS_INCLUDE@
UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@
USER_NAME = @USER_NAME@
UTIL_LINUX_UUIDROOT = @UTIL_LINUX_UUIDROOT@
UTIL_LINUX_UUID_C_INCLUDE = @UTIL_LINUX_UUID_C_INCLUDE@
UTIL_LINUX_UUID_C_LIB = @UTIL_LINUX_UUID_C_LIB@
UUID_C_LIB = @UUID_C_LIB@
VERSION = @VERSION@
XML2_LIBS = @XML2_LIBS@
abs_builddir = @abs_builddir@
......
......@@ -85,7 +85,12 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/config/mkinstalldirs \
$(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_cfortran_flags.m4 \
am__aclocal_m4_deps = $(top_srcdir)/libcdi/m4/acx_c_package.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_check_include.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_package.m4 \
$(top_srcdir)/libcdi/m4/acx_option_search_libs.m4 \
$(top_srcdir)/libcdi/m4/asx_tr_arg.m4 \
$(top_srcdir)/m4/acx_cfortran_flags.m4 \
$(top_srcdir)/m4/acx_check_cfortran.m4 \
$(top_srcdir)/m4/acx_options.m4 \
$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
......@@ -93,7 +98,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_cfortran_flags.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/acinclude.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_c_check_include.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
......@@ -474,6 +481,9 @@ NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPENMP_CFLAGS = @OPENMP_CFLAGS@
OSSP_UUIDROOT = @OSSP_UUIDROOT@
OSSP_UUID_C_INCLUDE = @OSSP_UUID_C_INCLUDE@
OSSP_UUID_C_LIB = @OSSP_UUID_C_LIB@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
......@@ -502,6 +512,10 @@ THREADS_LIBS = @THREADS_LIBS@
UDUNITS_INCLUDE = @UDUNITS_INCLUDE@
UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@
USER_NAME = @USER_NAME@
UTIL_LINUX_UUIDROOT = @UTIL_LINUX_UUIDROOT@
UTIL_LINUX_UUID_C_INCLUDE = @UTIL_LINUX_UUID_C_INCLUDE@
UTIL_LINUX_UUID_C_LIB = @UTIL_LINUX_UUID_C_LIB@
UUID_C_LIB = @UUID_C_LIB@
VERSION = @VERSION@
XML2_LIBS = @XML2_LIBS@
abs_builddir = @abs_builddir@
......
......@@ -81,7 +81,12 @@ subdir = test/data
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/config/mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_cfortran_flags.m4 \
am__aclocal_m4_deps = $(top_srcdir)/libcdi/m4/acx_c_package.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_check_include.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_package.m4 \
$(top_srcdir)/libcdi/m4/acx_option_search_libs.m4 \
$(top_srcdir)/libcdi/m4/asx_tr_arg.m4 \
$(top_srcdir)/m4/acx_cfortran_flags.m4 \
$(top_srcdir)/m4/acx_check_cfortran.m4 \
$(top_srcdir)/m4/acx_options.m4 \
$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
......@@ -89,7 +94,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acx_cfortran_flags.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
$(top_srcdir)/acinclude.m4 \
$(top_srcdir)/libcdi/m4/acx_lang_c_check_include.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
......@@ -210,6 +217,9 @@ NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPENMP_CFLAGS = @OPENMP_CFLAGS@
OSSP_UUIDROOT = @OSSP_UUIDROOT@
OSSP_UUID_C_INCLUDE = @OSSP_UUID_C_INCLUDE@
OSSP_UUID_C_LIB = @OSSP_UUID_C_LIB@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
......@@ -238,6 +248,10 @@ THREADS_LIBS = @THREADS_LIBS@
UDUNITS_INCLUDE = @UDUNITS_INCLUDE@
UDUNITS_LDFLAGS = @UDUNITS_LDFLAGS@
USER_NAME = @USER_NAME@
UTIL_LINUX_UUIDROOT = @UTIL_LINUX_UUIDROOT@
UTIL_LINUX_UUID_C_INCLUDE = @UTIL_LINUX_UUID_C_INCLUDE@
UTIL_LINUX_UUID_C_LIB = @UTIL_LINUX_UUID_C_LIB@
UUID_C_LIB = @UUID_C_LIB@
VERSION = @VERSION@
XML2_LIBS = @XML2_LIBS@
abs_builddir = @abs_builddir@
......
Markdown is supported
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