Skip to content

GitLab

Commit 80e9ce85 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

added configure option --with-cmor to specify location of CMOR library

parent 0aa92a27
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 390 additions and 196 deletions
Makefile.in
View file @ 80e9ce85
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
......@@ -218,6 +218,7 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLDFLAGS = @CLDFLAGS@
CLIBS = @CLIBS@
CMOR_LIBS = @CMOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CURL_INCLUDE = @CURL_INCLUDE@
......@@ -673,10 +674,9 @@ distcheck: dist
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
......
aclocal.m4
View file @ 80e9ce85
# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
# generated automatically by aclocal 1.14 -*- Autoconf -*-
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
......@@ -14,8 +14,8 @@
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.69.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
[m4_warning([this file was generated for autoconf 2.68.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
......@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.14'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.14.1], [],
m4_if([$1], [1.14], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
......@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.14.1])dnl
[AM_AUTOMAKE_VERSION([1.14])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
......
config/default
View file @ 80e9ce85
......@@ -65,6 +65,7 @@ case "${HOSTNAME}" in
# --with-hdf5=/opt/local \
# --with-szlib=$HOME/local \
# --with-proj=/opt/local \
# --with-cmor=/Users/m214003/work/CMOR \
# --with-curl=/opt/local"
CDOLIBS="--with-fftw3 \
--with-grib_api=$HOME/local/gribapi-1.13.0 \
......
configure
View file @ 80e9ce85
This diff is collapsed.
contrib/Makefile.in
View file @ 80e9ce85
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
......@@ -129,6 +129,7 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLDFLAGS = @CLDFLAGS@
CLIBS = @CLIBS@
CMOR_LIBS = @CMOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CURL_INCLUDE = @CURL_INCLUDE@
......
m4/acx_options.m4
View file @ 80e9ce85
......@@ -226,6 +226,32 @@ AC_SUBST([NETCDF_ROOT])
AC_SUBST([NETCDF_INCLUDE])
AC_SUBST([NETCDF_LIBS])
# ----------------------------------------------------------------------
# Link application with CMOR library
CMOR_LIBS=''
AC_ARG_WITH([cmor],
[AS_HELP_STRING([--with-cmor=<directory>],
[Specify location of CMOR library.])],
[AS_CASE(["$with_cmor"],
[no],[AC_MSG_CHECKING([for cmor library])
AC_MSG_RESULT([suppressed])],
[yes],[AC_CHECK_HEADERS([cmor.h])
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!])])
AC_SUBST([CMOR_LIBS],[" -lcmor"])],
[*],[CMOR_ROOT=$with_cmor
AS_IF([test -d "$CMOR_ROOT"],
[LDFLAGS="$LDFLAGS -L$CMOR_ROOT/lib"
CPPFLAGS="$CPPFLAGS -I$CMOR_ROOT/include"
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"],
[AC_MSG_ERROR([$CMOR_ROOT is not a directory! CMOR suppressed])])])],
[AC_MSG_CHECKING([for the CMOR library])
AC_MSG_RESULT([suppressed])])
AC_SUBST([CMOR_LIBS])
# ----------------------------------------------------------------------
# Link application with JASPER library (needed for GRIB2 compression)
JASPER_LIBS=''
AC_ARG_WITH([jasper],
......@@ -242,7 +268,7 @@ AC_ARG_WITH([jasper],
AS_IF([test -d "$JASPER_ROOT"],
[LDFLAGS="$LDFLAGS -L$JASPER_ROOT/lib"
CPPFLAGS="$CPPFLAGS -I$JASPER_ROOT/include"
AC_SEARCH_LIBS([jas_stream_memopen],
AC_SEARCH_LIBS([jas_init],
[jasper],
[AC_DEFINE([HAVE_LIBJASPER],[1],[Define to 1 for JPEG compression for GRIB2])],
[AC_MSG_ERROR([Could not link to jasper library! Required for GRIB_API])])
......
src/Makefile.in
View file @ 80e9ce85
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
......@@ -384,6 +384,7 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLDFLAGS = @CLDFLAGS@
CLIBS = @CLIBS@
CMOR_LIBS = @CMOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CURL_INCLUDE = @CURL_INCLUDE@
......
src/config.h.in
View file @ 80e9ce85
......@@ -12,6 +12,9 @@
/* Define to 1 for DATA support */
#undef ENABLE_DATA
/* Define to 1 if you have the <cmor.h> header file. */
#undef HAVE_CMOR_H
/* Define to 1 if you have the <curl/curl.h> header file. */
#undef HAVE_CURL_CURL_H
......@@ -55,6 +58,9 @@
/* Define to 1 for GRIB1 decoding/encoding with cgribex */
#undef HAVE_LIBCGRIBEX
/* Define to 1 for CMOR support */
#undef HAVE_LIBCMOR
/* Define to 1 for CURL support */
#undef HAVE_LIBCURL
......@@ -255,11 +261,6 @@
/* Version number of package */
#undef VERSION
/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
#endif
/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS
......
test/Makefile.in
View file @ 80e9ce85
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
......@@ -342,6 +342,7 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLDFLAGS = @CLDFLAGS@
CLIBS = @CLIBS@
CMOR_LIBS = @CMOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CURL_INCLUDE = @CURL_INCLUDE@
......
test/data/Makefile.in
View file @ 80e9ce85
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
......@@ -128,6 +128,7 @@ CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CLDFLAGS = @CLDFLAGS@
CLIBS = @CLIBS@
CMOR_LIBS = @CMOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CURL_INCLUDE = @CURL_INCLUDE@
......
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