Commit 3eb1f861 authored by Uwe Schulzweida's avatar Uwe Schulzweida

Merge branch 'develop'

parents dafc4dc3 65713933
2017-11-23 Uwe Schulzweida
* Using CDI library version 1.9.2
* Version 1.9.2 release
2017-11-21 Uwe Schulzweida
* expr: added variable name template _T
* expr: added operator ! (NOT)
2017-11-17 Uwe Schulzweida
* rotuvb changed behavior in different versions [Bug #8084]
2017-11-02 Uwe Schulzweida
* expr: nesting of ?: operator lost in cdo-1.9.1 [Bug #7992]
2017-10-26 Uwe Schulzweida
* select with start=end range aborts with 'Invalid character' [Bug #7976]
2017-10-25 Uwe Schulzweida
* Expr: convert constant parameter to float for 32-bit float data (bug fix)
* Condc: convert constant parameter to float for 32-bit float data (bug fix)
* Cond: convert data to float for 32-bit float data (bug fix)
2017-10-23 Uwe Schulzweida
* Added operator uv2vr_cfd: U and V wind to relative vorticity (interface to NCL)
* Added operator uv2dv_cfd: U and V wind to divergence (interface to NCL)
* gengrid: bug fix
2017-10-20 Uwe Schulzweida
* Ydaystat: don't adjust the output year if the last input year is incomplete (bug fix)
2017-10-08 Uwe Schulzweida
* changed type of nmiss to size_t
2017-10-05 Uwe Schulzweida 2017-10-05 Uwe Schulzweida
* Using CDI library version 1.9.1 * Using CDI library version 1.9.1
......
# Process this file with automake to produce Makefile.in # Process this file with automake to produce Makefile.in
SUBDIRS = libcdi src contrib test/data test 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 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
# #
......
...@@ -92,7 +92,9 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ ...@@ -92,7 +92,9 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/config/missing \ $(top_srcdir)/config/missing \
$(top_srcdir)/config/tap-driver.sh $(top_srcdir)/config/tap-driver.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/acx_options.m4 \ am__aclocal_m4_deps = $(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 \ $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
$(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \ $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/libtool.m4 \
...@@ -246,18 +248,22 @@ ENABLE_CDI_LIB = @ENABLE_CDI_LIB@ ...@@ -246,18 +248,22 @@ ENABLE_CDI_LIB = @ENABLE_CDI_LIB@
ENABLE_CGRIBEX = @ENABLE_CGRIBEX@ ENABLE_CGRIBEX = @ENABLE_CGRIBEX@
ENABLE_DATA = @ENABLE_DATA@ ENABLE_DATA = @ENABLE_DATA@
ENABLE_EXTRA = @ENABLE_EXTRA@ ENABLE_EXTRA = @ENABLE_EXTRA@
ENABLE_FORTRAN = @ENABLE_FORTRAN@
ENABLE_GRIB = @ENABLE_GRIB@ ENABLE_GRIB = @ENABLE_GRIB@
ENABLE_GRIBAPI = @ENABLE_GRIBAPI@ ENABLE_GRIBAPI = @ENABLE_GRIBAPI@
ENABLE_IEG = @ENABLE_IEG@ ENABLE_IEG = @ENABLE_IEG@
ENABLE_NC2 = @ENABLE_NC2@ ENABLE_NC2 = @ENABLE_NC2@
ENABLE_NC4 = @ENABLE_NC4@ ENABLE_NC4 = @ENABLE_NC4@
ENABLE_NC4HDF5 = @ENABLE_NC4HDF5@ ENABLE_NC4HDF5 = @ENABLE_NC4HDF5@
ENABLE_NEARPT3 = @ENABLE_NEARPT3@
ENABLE_NETCDF = @ENABLE_NETCDF@ ENABLE_NETCDF = @ENABLE_NETCDF@
ENABLE_SERVICE = @ENABLE_SERVICE@ ENABLE_SERVICE = @ENABLE_SERVICE@
ENABLE_THREADS = @ENABLE_THREADS@ ENABLE_THREADS = @ENABLE_THREADS@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
FCFLAGS = @FCFLAGS@ F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@ FGREP = @FGREP@
FORTRAN_WORKS = @FORTRAN_WORKS@
GREP = @GREP@ GREP = @GREP@
GRIB_API_INCLUDE = @GRIB_API_INCLUDE@ GRIB_API_INCLUDE = @GRIB_API_INCLUDE@
GRIB_API_LIBS = @GRIB_API_LIBS@ GRIB_API_LIBS = @GRIB_API_LIBS@
...@@ -333,6 +339,7 @@ ac_ct_AR = @ac_ct_AR@ ...@@ -333,6 +339,7 @@ ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@ ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@ ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
ac_ct_F77 = @ac_ct_F77@
am__include = @am__include@ am__include = @am__include@
am__leading_dot = @am__leading_dot@ am__leading_dot = @am__leading_dot@
am__quote = @am__quote@ am__quote = @am__quote@
...@@ -382,7 +389,7 @@ top_builddir = @top_builddir@ ...@@ -382,7 +389,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
# Process this file with automake to produce Makefile.in # Process this file with automake to produce Makefile.in
SUBDIRS = libcdi src contrib test/data test 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 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
# #
......
CDO NEWS CDO NEWS
-------- --------
Version 1.9.2 (23 November 2017):
Fixed bugs:
* sign of grid size increment changes [Bug #7974]
* compilation fails on OpenBSD [Bug #7961]
* expr: nesting of ternary operator lost in cdo-1.9.1 [Bug #7992]
* rotuvb changed behavior in different versions [Bug #8084]
* select with start=end range aborts with 'Invalid character' [Bug #7976]
Version 1.9.1 (27 September 2017): Version 1.9.1 (27 September 2017):
New features: New features:
......
...@@ -582,6 +582,11 @@ Operator catalog: ...@@ -582,6 +582,11 @@ Operator catalog:
Strgal strgal Strong gale days index per time period Strgal strgal Strong gale days index per time period
Hurr hurr Hurricane days index per time period Hurr hurr Hurricane days index per time period
CMORlite cmorlite CMOR lite CMORlite cmorlite CMOR lite
-------------------------------------------------------------
NCL
-------------------------------------------------------------
NCL_wind uv2vr_cfd U and V wind to relative vorticity
NCL_wind uv2dv_cfd U and V wind to divergence
------------------------------------------------------------- -------------------------------------------------------------
CMOR CMOR
------------------------------------------------------------- -------------------------------------------------------------
......
...@@ -1243,6 +1243,8 @@ AC_SUBST([am__tar]) ...@@ -1243,6 +1243,8 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar]) AC_SUBST([am__untar])
]) # _AM_PROG_TAR ]) # _AM_PROG_TAR
m4_include([m4/acx_cfortran_flags.m4])
m4_include([m4/acx_check_cfortran.m4])
m4_include([m4/acx_options.m4]) m4_include([m4/acx_options.m4])
m4_include([m4/ax_cxx_compile_stdcxx.m4]) m4_include([m4/ax_cxx_compile_stdcxx.m4])
m4_include([m4/ax_cxx_compile_stdcxx_11.m4]) m4_include([m4/ax_cxx_compile_stdcxx_11.m4])
......
{ {
"CXX" : "@CXX@", "build" : {
"CC" : "@CC@", "tools" : {
"CPP" : "@CPP@", "CXX" : "@CXX@",
"CPPFLAGS" : "@CPPFLAGS@", "CC" : "@CC@",
"CXXFLAGS" : "@CXXFLAGS@", "CPP" : "@CPP@",
"CFLAGS" : "@CFLAGS@", "CPPFLAGS" : "@CPPFLAGS@",
"LDFLAGS" : "@LDFLAGS@", "CXXFLAGS" : "@CXXFLAGS@",
"LIBS" : "@LIBS@", "CFLAGS" : "@CFLAGS@",
"FCFLAGS" : "@FCFLAGS@", "F77" : "@F77@",
"INCLUDES" : "@INCLUDES@", "FFLAGS" : "@FFLAGS@",
"LD" : "@LD@", "LDFLAGS" : "@LDFLAGS@",
"NM" : "@NM@", "LIBS" : "@LIBS@",
"AR" : "@AR@", "FCFLAGS" : "@FCFLAGS@",
"AS" : "@AS@", "INCLUDES" : "@INCLUDES@",
"DLLTOOL" : "@DLLTOOL@", "LD" : "@LD@",
"OBJDUMP" : "@OBJDUMP@", "NM" : "@NM@",
"STRIP" : "@STRIP@", "AR" : "@AR@",
"RANLIB" : "@RANLIB@", "AS" : "@AS@",
"INSTALL" : "@INSTALL@", "DLLTOOL" : "@DLLTOOL@",
"cdi" : { "OBJDUMP" : "@OBJDUMP@",
"enable_cdi_lib" : @ENABLE_CDI_LIB@ "STRIP" : "@STRIP@",
}, "RANLIB" : "@RANLIB@",
"threads" : { "INSTALL" : "@INSTALL@",
"lib" : "@THREADS_LIBS@", },
"include" : "@THREADS_INCLUDE@" "libraries" : {
"szlib" : { "threads" : {
"lib" : "@SZLIB_LIBS@", "lib" : "@THREADS_LIBS@",
"include" : "@SZLIB_INCLUDE@" "include" : "@THREADS_INCLUDE@"
},
"szlib" : {
"lib" : "@SZLIB_LIBS@",
"include" : "@SZLIB_INCLUDE@"
},
"hdf5" : {
"lib" : "@HDF5_LIBS@",
"include" : "@HDF5_INCLUDE@"
},
"netcdf" : {
"lib" : "@NETCDF_LIBS@",
"include" : "@NETCDF_INCLUDE@"
},
"udunits2" : {
"lib" : "@UDUNITS_LDFLAGS@",
"include" : "@UDUNITS_INCLUDE@"
},
"proj" : {
"lib" : "@PROJ_LDFLAGS@",
"include" : "@PROJ_INCLUDE@"
},
"magics" : {
"lib" : "@MAGICS_LIBS@",
"include" : "@MAGICS_INCLUDE@"
}
},
"platform" : {
"USER_NAME" : "@USER_NAME@",
"HOST_NAME" : "@HOST_NAME@",
"SYSTEM_TYPE" : "@SYSTEM_TYPE@"
},
}, },
"hdf5" : { "features" : {
"lib" : "@HDF5_LIBS@", "enable_cdi_lib" : @ENABLE_CDI_LIB@,
"include" : "@HDF5_INCLUDE@" "enable_data" : @ENABLE_DATA@,
}, "enable_fortran" : @ENABLE_FORTRAN@,
"netcdf" : { "fortran_works" : "@FORTRAN_WORKS@",
"lib" : "@NETCDF_LIBS@", }
"include" : "@NETCDF_INCLUDE@"
},
"udunits2" : {
"lib" : "@UDUNITS_LDFLAGS@",
"include" : "@UDUNITS_INCLUDE@"
},
"proj" : {
"lib" : "@PROJ_LDFLAGS@",
"include" : "@PROJ_INCLUDE@"
},
"magics" : {
"lib" : "@MAGICS_LIBS@",
"include" : "@MAGICS_INCLUDE@"
},
"USER_NAME" : "@USER_NAME@",
"HOST_NAME" : "@HOST_NAME@",
"SYSTEM_TYPE" : "@SYSTEM_TYPE@"
} }
...@@ -109,7 +109,8 @@ case "${HOSTNAME}" in ...@@ -109,7 +109,8 @@ case "${HOSTNAME}" in
CXX=icpc CXXFLAGS="-g -Wall -O2 -qopt-report=5 -march=native" \ CXX=icpc CXXFLAGS="-g -Wall -O2 -qopt-report=5 -march=native" \
CC=icc CFLAGS="-g -Wall -O2 -qopt-report=5 -march=native" CC=icc CFLAGS="-g -Wall -O2 -qopt-report=5 -march=native"
elif test "$COMP" = clang ; then elif test "$COMP" = clang ; then
${CONFPATH}configure \ ${CONFPATH}configure --prefix=$HOME/local \
--enable-maintainer-mode \
$CDOLIBS LDFLAGS="-Wl,-rpath,$HOME/local/eccodes-2.3.0/lib" \ $CDOLIBS LDFLAGS="-Wl,-rpath,$HOME/local/eccodes-2.3.0/lib" \
CXX=clang++ CXXFLAGS="-g -Wall -pedantic -O3" \ CXX=clang++ CXXFLAGS="-g -Wall -pedantic -O3" \
CC=clang CFLAGS="-g -Wall -pedantic -O3" CC=clang CFLAGS="-g -Wall -pedantic -O3"
...@@ -127,8 +128,9 @@ case "${HOSTNAME}" in ...@@ -127,8 +128,9 @@ case "${HOSTNAME}" in
${CONFPATH}configure --prefix=$HOME/local \ ${CONFPATH}configure --prefix=$HOME/local \
--enable-maintainer-mode \ --enable-maintainer-mode \
$CDOLIBS LDFLAGS="-Wl,-rpath,$HOME/local/eccodes-2.3.0/lib" \ $CDOLIBS LDFLAGS="-Wl,-rpath,$HOME/local/eccodes-2.3.0/lib" \
CXX=g++ CXXFLAGS="-g -pipe -Wall -W -Wfloat-equal -pedantic -O3 -march=native -Wa,-q -fstack-protector" \ F77=gfortran FFLAGS="-g -O2" \
CC=gcc CFLAGS="-g -pipe -Wall -W -Wfloat-equal -pedantic -O3 -march=native -Wa,-q -fstack-protector" CXX=g++ CXXFLAGS="-g -pipe -Wall -W -Wfloat-equal -pedantic -O3 -fstack-protector" \
CC=gcc CFLAGS="-g -pipe -Wall -W -Wfloat-equal -pedantic -O3 -fstack-protector"
# --with-libxml2=/usr \ # --with-libxml2=/usr \
# --with-magics=/Users/m214003/local/Magics-2.18.14nio \ # --with-magics=/Users/m214003/local/Magics-2.18.14nio \
fi fi
...@@ -231,6 +233,7 @@ case "${HOSTNAME}" in ...@@ -231,6 +233,7 @@ case "${HOSTNAME}" in
--with-fftw3 \ --with-fftw3 \
$CDOLIBS \ $CDOLIBS \
LDFLAGS="-Wl,-rpath,/sw/rhel6-x64/eccodes/eccodes-2.3.0-gcc48/lib" \ LDFLAGS="-Wl,-rpath,/sw/rhel6-x64/eccodes/eccodes-2.3.0-gcc48/lib" \
F77=ifort FFLAGS="-g -O2" \
CXX=icpc CXXFLAGS="-g -Wall -O2 -qopt-report=5 -march=core-avx2" \ CXX=icpc CXXFLAGS="-g -Wall -O2 -qopt-report=5 -march=core-avx2" \
CC=icc CFLAGS="-g -Wall -O2 -qopt-report=5 -march=core-avx2" CC=icc CFLAGS="-g -Wall -O2 -qopt-report=5 -march=core-avx2"
elif test "$COMP" = pgi ; then elif test "$COMP" = pgi ; then
...@@ -244,6 +247,7 @@ case "${HOSTNAME}" in ...@@ -244,6 +247,7 @@ case "${HOSTNAME}" in
--with-fftw3 \ --with-fftw3 \
$CDOLIBS \ $CDOLIBS \
LDFLAGS="-Wl,-rpath,/sw/rhel6-x64/eccodes/eccodes-2.3.0-gcc48/lib" \ LDFLAGS="-Wl,-rpath,/sw/rhel6-x64/eccodes/eccodes-2.3.0-gcc48/lib" \
F77=gfortran FFLAGS="-g -O2" \
CXX=g++ CXXFLAGS='-g -Wall -O3 -march=native -mavx2' \ CXX=g++ CXXFLAGS='-g -Wall -O3 -march=native -mavx2' \
CC=gcc CFLAGS='-g -Wall -O3 -march=native -mavx2' CC=gcc CFLAGS='-g -Wall -O3 -march=native -mavx2'
fi fi
......
This diff is collapsed.
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# autoconf 2.68 # autoconf 2.68
# libtool 2.4.2 # libtool 2.4.2
AC_INIT([cdo], [1.9.1], [http://mpimet.mpg.de/cdo]) AC_INIT([cdo], [1.9.2], [http://mpimet.mpg.de/cdo])
AC_DEFINE_UNQUOTED(CDO, ["$PACKAGE_VERSION"], [CDO version]) AC_DEFINE_UNQUOTED(CDO, ["$PACKAGE_VERSION"], [CDO version])
...@@ -34,6 +34,7 @@ AC_CHECK_TOOL([CXX],[g++],[:]) ...@@ -34,6 +34,7 @@ AC_CHECK_TOOL([CXX],[g++],[:])
AC_PROG_CC_C99 AC_PROG_CC_C99
AM_PROG_CC_C_O AM_PROG_CC_C_O
AC_PROG_CXX AC_PROG_CXX
AC_PROG_F77
AC_C_RESTRICT AC_C_RESTRICT
AX_CXX_COMPILE_STDCXX_11 AX_CXX_COMPILE_STDCXX_11
AC_OPENMP AC_OPENMP
...@@ -51,6 +52,7 @@ AC_PROG_INSTALL ...@@ -51,6 +52,7 @@ AC_PROG_INSTALL
# #
FC=no FC=no
export FC export FC
#
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Check large file support on 32 bit system # Check large file support on 32 bit system
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
...@@ -104,12 +106,21 @@ case "$CC" in ...@@ -104,12 +106,21 @@ case "$CC" in
*) C_VERSION=`$CC -V 2>&1 | head -n 1 | grep -v error`;; *) C_VERSION=`$CC -V 2>&1 | head -n 1 | grep -v error`;;
esac esac
case "$F77" in
pgf*) F77_VERSION=`$F77 -V | head -2 | tail -n 1`;;
gfortran*) F77_VERSION=`$F77 --version | head -n 1`;;
*) F77_VERSION=`$F77 -V 2>&1 | head -n 1 | grep -v error`;;
esac
if test -z "$CXX_VERSION" ; then CXX_VERSION="unknown"; fi; if test -z "$CXX_VERSION" ; then CXX_VERSION="unknown"; fi;
AC_DEFINE_UNQUOTED(CXX_VERSION, ["$CXX_VERSION"], [CXX Compiler version]) AC_DEFINE_UNQUOTED(CXX_VERSION, ["$CXX_VERSION"], [CXX Compiler version])
if test -z "$C_VERSION" ; then C_VERSION="unknown"; fi; if test -z "$C_VERSION" ; then C_VERSION="unknown"; fi;
AC_DEFINE_UNQUOTED(C_VERSION, ["$C_VERSION"], [C Compiler version]) AC_DEFINE_UNQUOTED(C_VERSION, ["$C_VERSION"], [C Compiler version])
if test -z "$F77_VERSION" ; then F77_VERSION="unknown"; fi;
AC_DEFINE_UNQUOTED(F77_VERSION, ["$F77_VERSION"], [F77 Compiler version])
# Checks for username, hostname and system type # Checks for username, hostname and system type
USERNAME=$LOGNAME USERNAME=$LOGNAME
if test -z "$USERNAME" ; then USERNAME=$USER; fi; if test -z "$USERNAME" ; then USERNAME=$USER; fi;
...@@ -138,16 +149,50 @@ AC_CHECK_FUNCS(sqrtl) ...@@ -138,16 +149,50 @@ AC_CHECK_FUNCS(sqrtl)
AC_CHECK_FUNCS(feenableexcept) AC_CHECK_FUNCS(feenableexcept)
# #
AC_CHECK_MEMBERS([fenv_t.__control, fenv_t.__mxcsr],,,[[#include <fenv.h>]]) AC_CHECK_MEMBERS([fenv_t.__control, fenv_t.__mxcsr],,,[[#include <fenv.h>]])
# ----------------------------------------------------------------------
# Create the Interface to Fortran77 routines via cfortran.h
AC_ARG_ENABLE([fortran],
[AS_HELP_STRING([--disable-fortran],
[Omit building of Fortran routines])],
[enable_fortran=${enableval}],[enable_fortran=yes])
AS_IF([test "x${enable_fortran}" = "xyes"], [
dnl ######################################################################
dnl Test whether cfortran.h works correctly
dnl ######################################################################
ACX_FIND_CFORTRAN_DEF
ACX_XLF_QEXTNAME_ADD_APPENDUS
AS_IF([test -n "$F77" -a X"$F77" != Xno],
[ACX_CHECK_CFORTRAN([$srcdir/src],
[AC_DEFINE([HAVE_CF_INTERFACE],[1],
[Defined to 1 if C / Fortran interface cfortran.h works])],
[AS_CASE([x"$acx_cv_cfortran_works"],
[x"error"],
[AC_MSG_NOTICE([Linking/Running with C EXTERNAL built with cfortran.h does not work!])],
[x"compiling with cfortran.h failed"],
[AC_MSG_NOTICE([Compilation with cfortran.h is not working!])],
[x"error compiling Fortran subroutine"],
[AC_MSG_NOTICE([compilation of simple Fortran source failed!])],
[AC_MSG_NOTICE([Unexpected error when linking C and Fortran via cfortran.h!])])
AC_MSG_NOTICE([Disabling cfortran.h bindings generation])
acx_cv_cfortran_works=no])])
])
AS_IF([test x$enable_fortran = 'xno'],[AC_SUBST([ENABLE_FORTRAN],[false])],[AC_SUBST([ENABLE_FORTRAN],[true])])
#
AM_CONDITIONAL([USE_F77],[test -n "$F77" -a X"$F77" != Xno -a x"$acx_cv_cfortran_works" = xyes])
AS_IF([test x$acx_cv_cfortran_works = 'xno'],[AC_SUBST([FORTRAN_WORKS],[no])],[AC_SUBST([FORTRAN_WORKS],[yes])])
# ----------------------------------------------------------------------
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Enable NEARPT3 support # Enable NEARPT3 support
# AC_MSG_CHECKING([for nearpt3 support]) AC_MSG_CHECKING([for nearpt3 support])
# AC_ARG_ENABLE([nearpt3], AS_HELP_STRING([--enable-nearpt3],[nearpt3 support [default=no]])) AC_ARG_ENABLE([nearpt3], AS_HELP_STRING([--enable-nearpt3],[nearpt3 support [default=no]]))
# AS_IF([test "x$enable_nearpt3" = "xyes"], [ AS_IF([test "x$enable_nearpt3" = "xyes"], [
# AC_DEFINE(ENABLE_NEARPT3, [1], [Define to 1 for nearpt3 support]) AC_DEFINE(ENABLE_NEARPT3, [1], [Define to 1 for nearpt3 support])
# ]) ])
# AC_MSG_RESULT([$enable_nearpt3]) AC_MSG_RESULT([$enable_nearpt3])
# AC_SUBST([ENABLE_NEARPT3],[$enable_nearpt3]) AC_SUBST([ENABLE_NEARPT3],[$enable_nearpt3])
# AM_CONDITIONAL([ENABLE_NEARPT3],[test x$enable_nearpt3 = 'xyes']) AM_CONDITIONAL([ENABLE_NEARPT3],[test x$enable_nearpt3 = 'xyes'])
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Enable DATA support # Enable DATA support
AC_MSG_CHECKING([for DATA support]) AC_MSG_CHECKING([for DATA support])
...@@ -156,7 +201,7 @@ AS_IF([test "x$enable_data" != 'xno'], [ ...@@ -156,7 +201,7 @@ AS_IF([test "x$enable_data" != 'xno'], [
AC_DEFINE(ENABLE_DATA, [1], [Define to 1 for DATA support]) AC_DEFINE(ENABLE_DATA, [1], [Define to 1 for DATA support])
]) ])
AC_MSG_RESULT([$enable_data]) AC_MSG_RESULT([$enable_data])
AC_SUBST([ENABLE_DATA],[$enable_data]) AS_IF([test x$enable_data = 'xno'],[AC_SUBST([ENABLE_DATA],[false])],[AC_SUBST([ENABLE_DATA],[true])])
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
CFLAGS="$CFLAGS ${OPENMP_CFLAGS}"