Commit d2de7a65 authored by Deike Kleberg's avatar Deike Kleberg
Browse files

Merge branch 'master' into cdi-pio

Conflicts:
	Makefile.in
	app/Makefile.in
	configure
	configure.ac
	examples/Makefile.in
	interfaces/Makefile.in
	src/Makefile.am
	src/Makefile.in
	src/cdi.inc
	src/config.h.in
	src/make_cdilib
	src/stream_grb.c
	tests/Makefile.in
parent 7637f18b
......@@ -14,12 +14,15 @@ app/Makefile.in -text
app/cdi.c -text
app/createtable.c -text
app/printinfo.h -text
/cdi.settings.in -text
config/compile -text
config/config.guess -text
config/config.sub -text
config/default -text
config/depcomp -text
config/install-sh -text
config/interface.rb -text
config/ltmain.sh -text
config/missing -text
config/mkinstalldirs -text
/config_tornado.sh -text
......@@ -79,6 +82,7 @@ examples/Makefile.in -text
examples/cdi_copy.c -text
examples/cdi_copy_f.f -text
examples/cdi_copy_file.c -text
examples/cdi_open.c -text
examples/cdi_read.c -text
examples/cdi_read_example.f90 -text
examples/cdi_read_f.f -text
......@@ -95,14 +99,15 @@ interfaces/cdi.cpp -text
interfaces/cdi.hpp -text
interfaces/cdilib.i -text
interfaces/cdiobj.i -text
interfaces/f2003/bindGen.rb -text
interfaces/python/CdiLib.py -text
interfaces/python/CdiObj.py -text
interfaces/python/cdilib_wrap.c -text
interfaces/python/cdiobj_wrap.cpp -text
interfaces/python/make.sh -text
interfaces/python/setup.py -text
interfaces/python/setupLib.py -text
interfaces/python/setupObj.py -text
interfaces/python/table.py -text
interfaces/python/testLib.py -text
interfaces/python/testObj.py -text
interfaces/ruby/cdilib_wrap.c -text
......@@ -115,7 +120,14 @@ interfaces/ruby/testObj.rb -text
interfaces/testdata/gridTest.nc -text
interfaces/testdata/mulval.grb -text
interfaces/testdata/mulval.nc -text
m4/acx_options.m4 -text
m4/acx_sl_mod_suffix.m4 -text
m4/ax_pthread.m4 -text
m4/libtool.m4 -text
m4/ltoptions.m4 -text
m4/ltsugar.m4 -text
m4/ltversion.m4 -text
m4/lt~obsolete.m4 -text
pioExamples/Makefile_blizzard -text
pioExamples/Makefile_tornado_parallel -text
pioExamples/Makefile_tornado_serial -text
......@@ -239,10 +251,12 @@ tables/cosmo250 -text
tables/default_tables -text
tables/echam4 -text
tables/echam5 -text
tables/echam6 -text
tables/ecmwf -text
tables/gen_tableheaderfile -text
tables/mpiom1 -text
tables/remo -text
tables/template.3.101.def -text
tables/wmo_001 -text
tests/Makefile.am -text
tests/Makefile.in -text
......
2011-03-15 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* using CGRIBEX library version 1.5.0
* Version 1.5.0 released
2011-03-13 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* stream_cdf: added support for GRIB2 parameter identifier
2011-03-08 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* Version 1.4.8 released
2011-02-06 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* vlistDestroy: fix memory leak
2011-01-25 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* added netCDF support for level bounds
2011-01-21 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* added grid type GRID_REFERENCE
* changed grid name GRID_CELL to GRID_UNSTRUCTURED
2011-01-19 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* added support to encode/decode GRIB1 with GRIB_API
2011-01-03 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* using CGRIBEX library version 1.4.7
* Version 1.4.7 released
2010-11-09 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* improved support for netCDF output from WRF model
2010-10-28 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cdfDefZaxis: changed hybrid level type from int to float
* taxisCopyTimestep: added mutex_lock
2010-10-26 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cgribexAddRecord: correct xinc/yinc if necessary [report: Anders Ullerstig]
2010-10-12 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cdfDefVCT: remove var mlev and ilev (bug fix) [report: Torsten Weber]
2010-10-05 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cdfOpenFile: create netCDF4 files without NC_CLASSIC_MODEL
* cdfOpenFile: switch off checking of netCDF4 format (read)
2010-09-27 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cdfDefTime: bug fix for time units 3HOURS, 6HOURS, 12HOURS
2010-09-17 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* using CGRIBEX library version 1.4.6
* Version 1.4.6 released
2010-09-09 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* GRIB1: use packing only for non constant fields [request: Luis Kornblueh]
* varDefZtype: bug fix [report: Stephanie Legutke]
2010-09-07 Ralf Mueller <ralf.mueller@zmaw.de>
* use libtool 2.2.10 for compiling + linking
* create shared + static library with PIC support by default
(positions independant code)
* build CDI configuration file: cdi.settings
2010-09-03 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* check axis attribute (bug fix) [report: Cui Chen]
2010-08-26 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* vlistCopyFlag: copy zaxis meta data
2010-08-25 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* Added support for attribute type int16 and float32 [Request: Don Murray]
2010-08-24 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* Version 1.4.5.2 released [request: Luis Kornblueh]
2010-08-02 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* added grid mask support
2010-07-26 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* added ECHAM6 GRIB1 code table
2010-07-23 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cdfInqContents: fixed out of bounds access to attstring [report: Heiner Widmann]
2010-07-05 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cdfInqContents: fix problem of wrong stdname for grid description [report: Michael Boettinger]
* Version 1.4.5.1 released
2010-07-05 Edi Kirk <E.Kirk@gmx.de>
* GRIB1 decode: Correct ZeroShiftError of simple packed spherical harmonics
2010-07-01 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cdfInqContents: use complex packing for spectral data [report: Edi Kirk]
2010-06-30 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* using CGRIBEX library version 1.4.5.1 (szip bug fix for 24 bit data)
2010-06-16 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* using CGRIBEX library version 1.4.5
* Version 1.4.5 released
2010-05-16 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* stream_history: added NC4 support [report: Etienne Tourigny]
2010-05-13 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cdfDefXYaxis: check also dimnames (bug fix) [report: Mikhail Itkin]
2010-05-12 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* stream_cdf: added support for uppercase attributes [request: Patrick Brockmann]
2010-05-07 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* gridGenYvals: bug fix for nlat > 4096 [report: Thomas Bergmann]
2010-04-29 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* Version 1.4.4 released
2010-04-24 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* gaussgrid: define M_SQRT2 [report: alastair.mckinstry@ichec.ie]
2010-04-16 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* MAX_STREAMS: changed fixed size of 4096 to dynamic range of 1024 - 65536
* MAX_VLISTS: changed fixed size of 4096 to dynamic range of 1024 - 65536
* MAX_TAXES: changed fixed size of 4096 to dynamic range of 1024 - 65536
2010-04-13 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cgribexDefTime: bug fix for GRIB time range 10
2010-04-09 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* added support for GRIB time units 3hours and 6hours [request: Jaison-Thomas Ambadan]
2010-04-01 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* vlistMerge: added support to merge levels
2010-03-31 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cgribexDefTime: bug fix for timerange=3 [report: Veronika Gayler]
* using CGRIBEX library version 1.4.4
2010-03-30 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* vlistCat: correct temporary parameter numbers
2010-03-19 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* added support for non integer time units MONTH
2010-03-12 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* gauaw: bug fix for allocation of zfnlat for odd number of nlat
2010-03-04 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* cdfDefGrid: check whether the variable or dimension name already exist
......
......@@ -33,15 +33,19 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
ChangeLog INSTALL NEWS config/config.guess config/config.sub \
config/depcomp config/install-sh config/missing \
config/mkinstalldirs
$(srcdir)/Makefile.in $(srcdir)/cdi.settings.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
config/compile config/config.guess config/config.sub \
config/depcomp config/install-sh config/ltmain.sh \
config/missing config/mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_sl_mod_suffix.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_options.m4 \
$(top_srcdir)/m4/acx_sl_mod_suffix.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
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
......@@ -49,7 +53,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/src/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_FILES = cdi.settings
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
......@@ -107,45 +111,77 @@ distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFINT = @CFINT@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_CDI_LIB = @ENABLE_CDI_LIB@
ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_GRIB = @ENABLE_GRIB@
ENABLE_IEG = @ENABLE_IEG@
ENABLE_PYTHON = @ENABLE_PYTHON@
ENABLE_RUBY = @ENABLE_RUBY@
ENABLE_SERVICE = @ENABLE_SERVICE@
EXEEXT = @EXEEXT@
F77 = @F77@
FC = @FC@
FCFLAGS = @FCFLAGS@
FCMODCASE = @FCMODCASE@
FCMODEXT = @FCMODEXT@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LDFLAGS = @GRIB_API_LDFLAGS@
HDF5_INCLUDE = @HDF5_INCLUDE@
HDF5_LDFLAGS = @HDF5_LDFLAGS@
HOST_NAME = @HOST_NAME@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JASPER_LDFLAGS = @JASPER_LDFLAGS@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
NETCDF_INCLUDE = @NETCDF_INCLUDE@
NETCDF_LDFLAGS = @NETCDF_LDFLAGS@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
......@@ -154,6 +190,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
PYTHON = @PYTHON@
RANLIB = @RANLIB@
RUBY = @RUBY@
......@@ -162,15 +201,22 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
SWIG = @SWIG@
SYSTEM_TYPE = @SYSTEM_TYPE@
SZLIB_INCLUDE = @SZLIB_INCLUDE@
SZLIB_LDFLAGS = @SZLIB_LDFLAGS@
THREADS_INCLUDE = @THREADS_INCLUDE@
THREADS_LDFLAGS = @THREADS_LDFLAGS@
USER_NAME = @USER_NAME@
VERSION = @VERSION@
ZLIB_INCLUDE = @ZLIB_INCLUDE@
ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
ac_ct_FC = @ac_ct_FC@
am__include = @am__include@
......@@ -178,6 +224,7 @@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
ax_pthread_config = @ax_pthread_config@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
......@@ -214,11 +261,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
......@@ -236,7 +279,7 @@ all: all-recursive
.SUFFIXES:
am--refresh:
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
......@@ -263,11 +306,22 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: $(am__configure_deps)
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(am__cd) $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
cdi.settings: $(top_builddir)/config.status $(srcdir)/cdi.settings.in
cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
distclean-libtool:
-rm -f libtool config.lt
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
......@@ -612,12 +666,13 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
clean-am: clean-generic mostlyclean-am
clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -f Makefile
distclean-am: clean-am distclean-generic distclean-tags
distclean-am: clean-am distclean-generic distclean-libtool \
distclean-tags
dvi: dvi-recursive
......@@ -667,7 +722,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
pdf: pdf-recursive
......@@ -684,18 +739,19 @@ uninstall-am:
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
distclean distclean-generic distclean-tags distcleancheck \
distdir distuninstallcheck dvi dvi-am html html-am info \
info-am install install-am install-data install-data-am \
install-dvi install-dvi-am install-exec install-exec-am \
install-html install-html-am install-info install-info-am \
install-man install-pdf install-pdf-am install-ps \
install-ps-am install-strip installcheck installcheck-am \
installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
distcheck distclean distclean-generic distclean-libtool \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-data install-data-am install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
install-pdf-am install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-recursive uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
......
CDI NEWS
--------
Version 1.5.0 (15 March 2011):
New features:
* GRIB2 support via ECMWF GRIB_API
* Added support for netCDF level bounds
Version 1.4.7 (3 January 2011):
New features:
* improved support for netCDF output from WRF model
Version 1.4.6 (17 September 2010):
New features:
* GRIB1: use packing only for non constant fields
* Added support for attribute type int16 and float32
* use libtool 2.2.10 for compiling + linking
Version 1.4.5.1 (5 July 2010):
New features:
* Added support for grid mask
* GRIB1 decode: Correct ZeroShiftError of simple packed spherical harmonics
Version 1.4.5 (6 June 2010):
Fixed bugs:
* stream_history: added NC4 support
* gridGenYvals: bug fix for nlat > 4096
Version 1.4.4 (29 April 2010):
New features:
* MAX_STREAMS: changed fixed size of 4096 to dynamic range of 1024 - 65536
* added support for GRIB1 time units 3hours and 6hours
* added support for non integer time units MONTH
* vlistMerge: added support to merge levels
Fixed bugs:
* gauaw: bug fix for allocation of zfnlat for odd number of nlat
* cgribexDefTime: bug fix for GRIB1 time range 3 and 10
dnl
dnl UD_CHECK_CFINT
dnl AC_CHECK_CFINT
dnl
dnl Check C / Fortran interface
dnl
AC_DEFUN([UD_CHECK_CFINT],
[
AC_CACHE_CHECK([whether the C / Fortran interface works],[ud_c_cfint],
AC_DEFUN([ACX_CHECK_CFINT],
[AC_CACHE_CHECK([whether the C / Fortran interface works],[acx_cv_check_cfint],
[AC_LANG_PUSH([C])
ud_save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS $CFINT"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include "$1"],[])],
[ud_c_cfint=yes],
[ud_c_cfint=no])
CFLAGS=$ud_save_CFLAGS
[acx_cv_check_cfint=yes],
[acx_cv_check_cfint=no])
AC_LANG_POP([C])])
AS_IF([test x$ud_c_cfint = xyes],
AS_IF([test x$acx_cv_check_cfint = xyes],
[AC_DEFINE(HAVE_CF_INTERFACE, [1],
[Define if C / Fortran interface cfortran.h works])])
])
......
......@@ -599,6 +599,46 @@ fi
rmdir .tst 2>/dev/null
AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 5
# AM_MAINTAINER_MODE([DEFAULT-MODE])
# ----------------------------------
# Control maintainer-specific portions of Makefiles.
# Default is to disable them, unless `enable' is passed literally.
# For symmetry, `disable' may be passed as well. Anyway, the user
# can override the default with the --enable/--disable switch.
AC_DEFUN([AM_MAINTAINER_MODE],
[m4_case(m4_default([$1], [disable]),
[enable], [m4_define([am_maintainer_other], [disable])],
[disable], [m4_define([am_maintainer_other], [enable])],
[m4_define([am_maintainer_other], [enable])
m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
dnl maintainer-mode's default is 'disable' unless 'enable' is passed
AC_ARG_ENABLE([maintainer-mode],
[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
(and sometimes confusing) to the casual installer],
[USE_MAINTAINER_MODE=$enableval],
[USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
AC_MSG_RESULT([$USE_MAINTAINER_MODE])
AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
MAINT=$MAINTAINER_MODE_TRUE
AC_SUBST([MAINT])dnl
]
)
AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
......@@ -961,5 +1001,12 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([m4/acx_options.m4])
m4_include([m4/acx_sl_mod_suffix.m4])
m4_include([m4/ax_pthread.m4])
m4_include([m4/libtool.m4])
m4_include([m4/ltoptions.m4])
m4_include([m4/ltsugar.m4])
m4_include([m4/ltversion.m4])
m4_include([m4/lt~obsolete.m4])
m4_include([acinclude.m4])
## Process this file with automake to produce Makefile.in
#
bin_PROGRAMS = cdi
#
noinst_PROGRAMS = createtable