From 58fccb602e0c626b010a0dadffe867a25a78e576 Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Tue, 26 Mar 2019 10:06:20 -0600 Subject: [PATCH] turning on --enable-fortran in DISTCHECK_CONFIGURE_FLAGS for travis --- .travis.yml | 1 + configure.ac | 5 ++--- set_flags.am | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6bf4809cb59..e691270359c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,7 @@ script: - autoreconf -i - export CFLAGS='-std=c99 -fsanitize=address -fno-omit-frame-pointer' - export FFLAGS='-fsanitize=address -fno-omit-frame-pointer' + - export DISTCHECK_CONFIGURE_FLAGS='--enable-fortran' - ./configure --enable-fortran - make -j distcheck - rm -rf build diff --git a/configure.ac b/configure.ac index 194f211bfb7..e5fc80ba535 100644 --- a/configure.ac +++ b/configure.ac @@ -58,9 +58,7 @@ AC_ARG_ENABLE([pnetcdf], [Disable pnetcdf use.])]) test "x$enable_pnetcdf" = xno || enable_pnetcdf=yes AC_MSG_RESULT([$enable_pnetcdf]) -if test "x$enable_logging" = xyes; then - AC_DEFINE([PIO_ENABLE_LOGGING], 1, [If true, turn on logging.]) -fi +AM_CONDITIONAL(BUILD_PNETCDF, [test "x$enable_pnetcdf" = xyes]) # NetCDF (at least classic) is required for PIO to build. AC_DEFINE([_NETCDF], [1], [netCDF classic library available]) @@ -110,6 +108,7 @@ AC_MSG_RESULT([${have_netcdf_par}]) if test x$have_netcdf_par = xyes; then AC_DEFINE([_NETCDF4],[1],[Does netCDF library provide netCDF-4 with parallel access]) fi +AM_CONDITIONAL(BUILD_NETCDF4, [test "x$have_netcdf_par" = xyes]) # Not working for some reason, so I will just set it... AC_CHECK_TYPE([MPI_Offset], [], [], [#include ]) diff --git a/set_flags.am b/set_flags.am index b8cc1237059..d3c93e0797a 100644 --- a/set_flags.am +++ b/set_flags.am @@ -4,6 +4,7 @@ # # Set the CPPFLAGS. -AM_CPPFLAGS = -I$(top_srcdir)/src/flib -AM_CPPFLAGS += "-D_NETCDF -D_NETCDF4 -D_PETCDF" +AM_CPPFLAGS = -I$(top_srcdir)/src/flib -D_NETCDF +AM_CPPFLAGS += -D_PETCDF +AM_CPPFLAGS += -D_NETCDF4