From c10a740aed0484bb77e7152c4f4dce728c0f8efe Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 12 Sep 2023 10:09:53 -0600 Subject: [PATCH 001/109] #2231 Added vx_data2d_ugrid --- Make-include | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Make-include b/Make-include index cf85bcd271..bdde7b71a4 100644 --- a/Make-include +++ b/Make-include @@ -15,6 +15,7 @@ MET_CPPFLAGS = -I${top_builddir}/src/basic/vx_cal \ -I${top_builddir}/src/libcode/vx_data2d_nc_met \ -I${top_builddir}/src/libcode/vx_data2d_nc_pinterp \ -I${top_builddir}/src/libcode/vx_data2d_python \ + -I${top_builddir}/src/libcode/vx_data2d_ugrid \ -I${top_builddir}/src/libcode/vx_python3_utils \ -I${top_builddir}/src/libcode/vx_geodesy \ -I${top_builddir}/src/libcode/vx_gis \ @@ -61,6 +62,7 @@ MET_LDFLAGS = -L${top_builddir}/src/basic/vx_cal \ -L${top_builddir}/src/libcode/vx_data2d_nc_met \ -L${top_builddir}/src/libcode/vx_data2d_nc_pinterp \ -L${top_builddir}/src/libcode/vx_data2d_python \ + -L${top_builddir}/src/libcode/vx_data2d_ugrid \ -L${top_builddir}/src/libcode/vx_python3_utils \ -L${top_builddir}/src/libcode/vx_geodesy \ -L${top_builddir}/src/libcode/vx_gis \ From 256ef42e61c860573feec5882b960237da01bbb6 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 12 Sep 2023 10:12:22 -0600 Subject: [PATCH 002/109] #2231 Added MET_ATLAS and MET_ECKIT --- configure | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 64 +++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+) diff --git a/configure b/configure index 1e7e56769e..b5bd75ff38 100755 --- a/configure +++ b/configure @@ -757,6 +757,12 @@ MET_HDF5 MET_NETCDFLIB MET_NETCDFINC MET_NETCDF +MET_ECKITLIB +MET_ECKITINC +MET_ECKIT +MET_ATLASLIB +MET_ATLASINC +MET_ATLAS MET_PROJLIB MET_PROJINC MET_PROJ @@ -894,6 +900,12 @@ CPPFLAGS MET_PROJ MET_PROJINC MET_PROJLIB +MET_ATLAS +MET_ATLASINC +MET_ATLASLIB +MET_ECKIT +MET_ECKITINC +MET_ECKITLIB MET_NETCDF MET_NETCDFINC MET_NETCDFLIB @@ -1627,6 +1639,30 @@ Some influential environment variables: include files are not under the same main proj directory. If used, MET_PROJINC must also be defined and MET_PROJ will be ignored. + MET_ATLAS Where atlas lib and include subdirectories are located. If they + are installed in /usr/local, you don't have to specify them. + MET_ATLASINC + Where atlas include files are located. Use if the libraries and + include files are not under the same main atlas directory. If + used, MET_ATLASLIB must also be defined and MET_ATLAS will be + ignored. + MET_ATLASLIB + Where atlas libraries are located. Use if the libraries and + include files are not under the same main atlas directory. If + used, MET_ATLASINC must also be defined and MET_ATLAS will be + ignored. + MET_ECKIT Where eckit lib and include subdirectories are located. If they + are installed in /usr/local, you don't have to specify them. + MET_ECKITINC + Where eckit include files are located. Use if the libraries and + include files are not under the same main eckit directory. If + used, MET_ECKITLIB must also be defined and MET_ECKIT will be + ignored. + MET_ECKITLIB + Where eckit libraries are located. Use if the libraries and + include files are not under the same main eckit directory. If + used, MET_ECKITINC must also be defined and MET_ECKIT will be + ignored. MET_NETCDF Where netcdf lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them. MET_NETCDFINC @@ -4561,6 +4597,70 @@ if (test -n "$MET_PROJLIB"); then LDFLAGS="${LDFLAGS} -L${MET_PROJLIB}" fi +# +# Look for the Atlas library. +# + +# Configure the variables. The help text will appear if the user uses "configure --help". + + + + + +# Ensure that both or neither are specified. + +if (test -n "$MET_ATLASLIB" && test -z "$MET_ATLASINC"); then + as_fn_error $? "MET_ATLASLIB environment variable set, but MET_ATLASINC not set. If one of these variables is set, then both must be set." "$LINENO" 5 +elif (test -n "$MET_ATLASINC" && test -z "$MET_ATLASLIB"); then + as_fn_error $? "MET_ATLASINC environment variable set, but MET_ATLASLIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 +fi + +# Use the main Atlas directory if individual locations were not specified. + +if (test -n "$MET_ATLAS" && test -z "$MET_ATLASLIB"); then + MET_ATLASINC='${MET_ATLAS}/include' + MET_ATLASLIB='${MET_ATLAS}/lib' +fi + +# AC_SUBST command line variables. + +if (test -n "$MET_ATLASLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_ATLASINC}" + LDFLAGS="${LDFLAGS} -L${MET_ATLASLIB}" +fi + +# +# Look for the Eckit library. +# + +# Configure the variables. The help text will appear if the user uses "configure --help". + + + + + +# Ensure that both or neither are specified. + +if (test -n "$MET_ECKITLIB" && test -z "$MET_ECKITINC"); then + as_fn_error $? "MET_ECKITLIB environment variable set, but MET_ECKITINC not set. If one of these variables is set, then both must be set." "$LINENO" 5 +elif (test -n "$MET_ECKITINC" && test -z "$MET_ECKITLIB"); then + as_fn_error $? "MET_ECKITINC environment variable set, but MET_ECKITLIB not set. If one of these variables is set, then both must be set." "$LINENO" 5 +fi + +# Use the main Eckit directory if individual locations were not specified. + +if (test -n "$MET_ECKIT" && test -z "$MET_ECKITLIB"); then + MET_ECKITINC='${MET_ECKIT}/include' + MET_ECKITLIB='${MET_ECKIT}/lib' +fi + +# AC_SUBST command line variables. + +if (test -n "$MET_ECKITLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_ECKITINC}" + LDFLAGS="${LDFLAGS} -L${MET_ECKITLIB}" +fi + # # Look for the NetCDF library. # diff --git a/configure.ac b/configure.ac index 49d3397a6a..2dada7903b 100644 --- a/configure.ac +++ b/configure.ac @@ -47,6 +47,70 @@ if (test -n "$MET_PROJLIB"); then LDFLAGS="${LDFLAGS} -L${MET_PROJLIB}" fi +# +# Look for the Atlas library. +# + +# Configure the variables. The help text will appear if the user uses "configure --help". + +AC_ARG_VAR([MET_ATLAS], [Where atlas lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them.]) +AC_ARG_VAR([MET_ATLASINC], [Where atlas include files are located. Use if the libraries and include files are not under the same main atlas directory. If used, MET_ATLASLIB must also be defined and MET_ATLAS will be ignored.]) +AC_ARG_VAR([MET_ATLASLIB], [Where atlas libraries are located. Use if the libraries and include files are not under the same main atlas directory. If used, MET_ATLASINC must also be defined and MET_ATLAS will be ignored.]) + +# Ensure that both or neither are specified. + +if (test -n "$MET_ATLASLIB" && test -z "$MET_ATLASINC"); then + AC_MSG_ERROR([MET_ATLASLIB environment variable set, but MET_ATLASINC not set. If one of these variables is set, then both must be set.]) +elif (test -n "$MET_ATLASINC" && test -z "$MET_ATLASLIB"); then + AC_MSG_ERROR([MET_ATLASINC environment variable set, but MET_ATLASLIB not set. If one of these variables is set, then both must be set.]) +fi + +# Use the main Atlas directory if individual locations were not specified. + +if (test -n "$MET_ATLAS" && test -z "$MET_ATLASLIB"); then + MET_ATLASINC='${MET_ATLAS}/include' + MET_ATLASLIB='${MET_ATLAS}/lib' +fi + +# AC_SUBST command line variables. + +if (test -n "$MET_ATLASLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_ATLASINC}" + LDFLAGS="${LDFLAGS} -L${MET_ATLASLIB}" +fi + +# +# Look for the Eckit library. +# + +# Configure the variables. The help text will appear if the user uses "configure --help". + +AC_ARG_VAR([MET_ECKIT], [Where eckit lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them.]) +AC_ARG_VAR([MET_ECKITINC], [Where eckit include files are located. Use if the libraries and include files are not under the same main eckit directory. If used, MET_ECKITLIB must also be defined and MET_ECKIT will be ignored.]) +AC_ARG_VAR([MET_ECKITLIB], [Where eckit libraries are located. Use if the libraries and include files are not under the same main eckit directory. If used, MET_ECKITINC must also be defined and MET_ECKIT will be ignored.]) + +# Ensure that both or neither are specified. + +if (test -n "$MET_ECKITLIB" && test -z "$MET_ECKITINC"); then + AC_MSG_ERROR([MET_ECKITLIB environment variable set, but MET_ECKITINC not set. If one of these variables is set, then both must be set.]) +elif (test -n "$MET_ECKITINC" && test -z "$MET_ECKITLIB"); then + AC_MSG_ERROR([MET_ECKITINC environment variable set, but MET_ECKITLIB not set. If one of these variables is set, then both must be set.]) +fi + +# Use the main Eckit directory if individual locations were not specified. + +if (test -n "$MET_ECKIT" && test -z "$MET_ECKITLIB"); then + MET_ECKITINC='${MET_ECKIT}/include' + MET_ECKITLIB='${MET_ECKIT}/lib' +fi + +# AC_SUBST command line variables. + +if (test -n "$MET_ECKITLIB"); then + CPPFLAGS="${CPPFLAGS} -I${MET_ECKITINC}" + LDFLAGS="${LDFLAGS} -L${MET_ECKITLIB}" +fi + # # Look for the NetCDF library. # From 8ebb8d4bcc63e36333b12be2ebb4d0ce88508197 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 12 Sep 2023 10:12:53 -0600 Subject: [PATCH 003/109] #2231 Added MET_ATLAS and MET_ECKIT --- Makefile.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile.in b/Makefile.in index b93bd865e6..45633a0f95 100644 --- a/Makefile.in +++ b/Makefile.in @@ -248,11 +248,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ From e3322d4e1a5e1aa17ef0147922c5857a8c279b0a Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 12 Sep 2023 10:13:52 -0600 Subject: [PATCH 004/109] #2231 Added MET_ATLAS and MET_ECKIT --- internal/scripts/environment/development.seneca | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/scripts/environment/development.seneca b/internal/scripts/environment/development.seneca index 51099f2bd1..9576abd644 100644 --- a/internal/scripts/environment/development.seneca +++ b/internal/scripts/environment/development.seneca @@ -21,6 +21,8 @@ export MET_CAIROLIB=/usr/lib/x86_64-linux-gnu export MET_FREETYPEINC=/usr/include/freetype2 export MET_FREETYPELIB=/usr/lib/x86_64-linux-gnu export MET_JASPER=${MET_DST}/jasper-1.900.1 +export MET_ATLAS=${MET_PROJ_DIR}/MET_releases/external_libs/gnu_8.3.0/atlas +export MET_ECKIT=${MET_PROJ_DIR}/MET_releases/external_libs/gnu_8.3.0/eckit # For Python 3 in met-9.0 export MET_PYTHON=/usr/local/met-python3 @@ -36,6 +38,7 @@ export CXXFLAGS=${CFLAGS} export LDFLAGS="-Wl,--disable-new-dtags" export LDFLAGS="${LDFLAGS} -Wl,-rpath,${MET_DST}/lib:${MET_HDFEOS}/lib:${MET_PROJ}/lib:${MET_NETCDF}/lib:${MET_DST}/zlib-1.2.11/lib:${MET_DST}/szip-2.1.1/lib" export LDFLAGS="${LDFLAGS} -Wl,-rpath,${MET_HDFLIB}:${MET_HDF5}/lib:${MET_GSL}/lib:${MET_PYTHON}/lib:${MET_JASPER}/lib" +export LDFLAGS="${LDFLAGS} -Wl,-rpath,${MET_ATLAS}/lib:${MET_ECKIT}/lib" export LDFLAGS="${LDFLAGS} -L${MET_JASPER}/lib" # Variables required to run MET From df81425e9ac397583757cf30673d3982b13cc191 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 12 Sep 2023 10:37:31 -0600 Subject: [PATCH 005/109] #2231 Added MET_ATLAS and MET_ECKIT --- data/Makefile.in | 6 ++++++ data/climo/Makefile.in | 6 ++++++ data/climo/seeps/Makefile.in | 6 ++++++ data/colortables/Makefile.in | 6 ++++++ data/colortables/NCL_colortables/Makefile.in | 6 ++++++ data/config/Makefile.in | 6 ++++++ data/map/Makefile.in | 6 ++++++ data/map/admin_by_country/Makefile.in | 6 ++++++ data/poly/HMT_masks/Makefile.in | 6 ++++++ data/poly/Makefile.in | 6 ++++++ data/poly/NCEP_masks/Makefile.in | 6 ++++++ data/ps/Makefile.in | 6 ++++++ data/table_files/Makefile.in | 6 ++++++ data/tc_data/Makefile.in | 6 ++++++ internal/test_util/Makefile.in | 6 ++++++ internal/test_util/basic/Makefile.in | 6 ++++++ internal/test_util/basic/vx_config/Makefile.in | 6 ++++++ internal/test_util/basic/vx_log/Makefile.in | 6 ++++++ internal/test_util/basic/vx_util/Makefile.in | 6 ++++++ internal/test_util/libcode/Makefile.in | 6 ++++++ internal/test_util/libcode/vx_data2d/Makefile.in | 6 ++++++ internal/test_util/libcode/vx_data2d_factory/Makefile.in | 6 ++++++ internal/test_util/libcode/vx_data2d_grib/Makefile.in | 6 ++++++ internal/test_util/libcode/vx_data2d_nc_met/Makefile.in | 6 ++++++ internal/test_util/libcode/vx_data2d_nccf/Makefile.in | 6 ++++++ internal/test_util/libcode/vx_geodesy/Makefile.in | 6 ++++++ internal/test_util/libcode/vx_grid/Makefile.in | 6 ++++++ internal/test_util/libcode/vx_nc_util/Makefile.in | 6 ++++++ internal/test_util/libcode/vx_physics/Makefile.in | 6 ++++++ internal/test_util/libcode/vx_plot_util/Makefile.in | 6 ++++++ internal/test_util/libcode/vx_ps/Makefile.in | 6 ++++++ internal/test_util/libcode/vx_series_data/Makefile.in | 6 ++++++ internal/test_util/libcode/vx_solar/Makefile.in | 6 ++++++ internal/test_util/libcode/vx_tc_util/Makefile.in | 6 ++++++ internal/test_util/tools/Makefile.in | 6 ++++++ internal/test_util/tools/other/Makefile.in | 6 ++++++ internal/test_util/tools/other/mode_time_domain/Makefile.in | 6 ++++++ scripts/Rscripts/Makefile.in | 6 ++++++ scripts/Rscripts/include/Makefile.in | 6 ++++++ scripts/python/Makefile.in | 6 ++++++ scripts/python/examples/Makefile.in | 6 ++++++ scripts/python/met/Makefile.in | 6 ++++++ scripts/python/pyembed/Makefile.in | 6 ++++++ scripts/python/tc_diag/Makefile.in | 6 ++++++ scripts/python/utility/Makefile.in | 6 ++++++ src/Makefile.in | 6 ++++++ src/basic/Makefile.in | 6 ++++++ src/basic/enum_to_string/Makefile.in | 6 ++++++ src/basic/vx_cal/Makefile.in | 6 ++++++ src/basic/vx_config/Makefile.in | 6 ++++++ src/basic/vx_log/Makefile.in | 6 ++++++ src/basic/vx_math/Makefile.in | 6 ++++++ src/basic/vx_util/Makefile.in | 6 ++++++ src/basic/vx_util_math/Makefile.in | 6 ++++++ src/libcode/vx_afm/Makefile.in | 6 ++++++ src/libcode/vx_analysis_util/Makefile.in | 6 ++++++ src/libcode/vx_bool_calc/Makefile.in | 6 ++++++ src/libcode/vx_color/Makefile.in | 6 ++++++ src/libcode/vx_data2d/Makefile.in | 6 ++++++ src/libcode/vx_data2d_factory/Makefile.in | 6 ++++++ src/libcode/vx_data2d_grib/Makefile.in | 6 ++++++ src/libcode/vx_data2d_grib2/Makefile.in | 6 ++++++ src/libcode/vx_data2d_nc_met/Makefile.in | 6 ++++++ src/libcode/vx_data2d_nc_pinterp/Makefile.in | 6 ++++++ src/libcode/vx_data2d_nccf/Makefile.in | 6 ++++++ src/libcode/vx_data2d_python/Makefile.in | 6 ++++++ src/libcode/vx_geodesy/Makefile.in | 6 ++++++ src/libcode/vx_gis/Makefile.in | 6 ++++++ src/libcode/vx_gnomon/Makefile.in | 6 ++++++ src/libcode/vx_gsl_prob/Makefile.in | 6 ++++++ src/libcode/vx_nav/Makefile.in | 6 ++++++ src/libcode/vx_nc_obs/Makefile.in | 6 ++++++ src/libcode/vx_nc_util/Makefile.in | 6 ++++++ src/libcode/vx_pb_util/Makefile.in | 6 ++++++ src/libcode/vx_physics/Makefile.in | 6 ++++++ src/libcode/vx_plot_util/Makefile.in | 6 ++++++ src/libcode/vx_pointdata_python/Makefile.in | 6 ++++++ src/libcode/vx_ps/Makefile.in | 6 ++++++ src/libcode/vx_pxm/Makefile.in | 6 ++++++ src/libcode/vx_python3_utils/Makefile.in | 6 ++++++ src/libcode/vx_regrid/Makefile.in | 6 ++++++ src/libcode/vx_render/Makefile.in | 6 ++++++ src/libcode/vx_seeps/Makefile.in | 6 ++++++ src/libcode/vx_series_data/Makefile.in | 6 ++++++ src/libcode/vx_shapedata/Makefile.in | 6 ++++++ src/libcode/vx_solar/Makefile.in | 6 ++++++ src/libcode/vx_stat_out/Makefile.in | 6 ++++++ src/libcode/vx_statistics/Makefile.in | 6 ++++++ src/libcode/vx_summary/Makefile.in | 6 ++++++ src/libcode/vx_tc_util/Makefile.in | 6 ++++++ src/libcode/vx_time_series/Makefile.in | 6 ++++++ 91 files changed, 546 insertions(+) diff --git a/data/Makefile.in b/data/Makefile.in index a3fb0c78e1..614191d371 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -253,11 +253,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/data/climo/Makefile.in b/data/climo/Makefile.in index f653ea973c..caafe39670 100644 --- a/data/climo/Makefile.in +++ b/data/climo/Makefile.in @@ -223,11 +223,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/data/climo/seeps/Makefile.in b/data/climo/seeps/Makefile.in index b3cf3b8346..8e67daea3b 100644 --- a/data/climo/seeps/Makefile.in +++ b/data/climo/seeps/Makefile.in @@ -193,11 +193,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/data/colortables/Makefile.in b/data/colortables/Makefile.in index bc2c584108..e38a39cbfd 100644 --- a/data/colortables/Makefile.in +++ b/data/colortables/Makefile.in @@ -253,11 +253,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/data/colortables/NCL_colortables/Makefile.in b/data/colortables/NCL_colortables/Makefile.in index 3f33b60626..7fe8a360f8 100644 --- a/data/colortables/NCL_colortables/Makefile.in +++ b/data/colortables/NCL_colortables/Makefile.in @@ -193,11 +193,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/data/config/Makefile.in b/data/config/Makefile.in index b5e7cdd628..240167d152 100644 --- a/data/config/Makefile.in +++ b/data/config/Makefile.in @@ -193,11 +193,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/data/map/Makefile.in b/data/map/Makefile.in index 99b4d844bd..c793ec8acb 100644 --- a/data/map/Makefile.in +++ b/data/map/Makefile.in @@ -253,11 +253,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/data/map/admin_by_country/Makefile.in b/data/map/admin_by_country/Makefile.in index dfe35f6d1e..e5521c4c14 100644 --- a/data/map/admin_by_country/Makefile.in +++ b/data/map/admin_by_country/Makefile.in @@ -193,11 +193,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/data/poly/HMT_masks/Makefile.in b/data/poly/HMT_masks/Makefile.in index 913f377f04..d7c8e28d6c 100644 --- a/data/poly/HMT_masks/Makefile.in +++ b/data/poly/HMT_masks/Makefile.in @@ -193,11 +193,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/data/poly/Makefile.in b/data/poly/Makefile.in index 48c826f0f9..52b7a7c870 100644 --- a/data/poly/Makefile.in +++ b/data/poly/Makefile.in @@ -253,11 +253,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/data/poly/NCEP_masks/Makefile.in b/data/poly/NCEP_masks/Makefile.in index 4c05b09c25..edc7d5c139 100644 --- a/data/poly/NCEP_masks/Makefile.in +++ b/data/poly/NCEP_masks/Makefile.in @@ -193,11 +193,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/data/ps/Makefile.in b/data/ps/Makefile.in index 81d8853a46..d575693bfb 100644 --- a/data/ps/Makefile.in +++ b/data/ps/Makefile.in @@ -193,11 +193,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/data/table_files/Makefile.in b/data/table_files/Makefile.in index 75416d29e5..9cc6f40af7 100644 --- a/data/table_files/Makefile.in +++ b/data/table_files/Makefile.in @@ -193,11 +193,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/data/tc_data/Makefile.in b/data/tc_data/Makefile.in index 9cbf6fdbb6..c0ddfb498a 100644 --- a/data/tc_data/Makefile.in +++ b/data/tc_data/Makefile.in @@ -193,11 +193,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/Makefile.in b/internal/test_util/Makefile.in index 273b760ac6..74888dad40 100644 --- a/internal/test_util/Makefile.in +++ b/internal/test_util/Makefile.in @@ -223,11 +223,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/basic/Makefile.in b/internal/test_util/basic/Makefile.in index 297b68955b..10ba1f6e7c 100644 --- a/internal/test_util/basic/Makefile.in +++ b/internal/test_util/basic/Makefile.in @@ -223,11 +223,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/basic/vx_config/Makefile.in b/internal/test_util/basic/vx_config/Makefile.in index b4f2a63d55..0285cb4d04 100644 --- a/internal/test_util/basic/vx_config/Makefile.in +++ b/internal/test_util/basic/vx_config/Makefile.in @@ -248,11 +248,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/basic/vx_log/Makefile.in b/internal/test_util/basic/vx_log/Makefile.in index a280f93a32..add245c3cc 100644 --- a/internal/test_util/basic/vx_log/Makefile.in +++ b/internal/test_util/basic/vx_log/Makefile.in @@ -217,11 +217,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/basic/vx_util/Makefile.in b/internal/test_util/basic/vx_util/Makefile.in index 468ceb6843..a840e025e2 100644 --- a/internal/test_util/basic/vx_util/Makefile.in +++ b/internal/test_util/basic/vx_util/Makefile.in @@ -253,11 +253,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/libcode/Makefile.in b/internal/test_util/libcode/Makefile.in index 3cbc250888..3514c90ed9 100644 --- a/internal/test_util/libcode/Makefile.in +++ b/internal/test_util/libcode/Makefile.in @@ -223,11 +223,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/libcode/vx_data2d/Makefile.in b/internal/test_util/libcode/vx_data2d/Makefile.in index 5ddc56a697..40b6b92ed3 100644 --- a/internal/test_util/libcode/vx_data2d/Makefile.in +++ b/internal/test_util/libcode/vx_data2d/Makefile.in @@ -221,11 +221,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/libcode/vx_data2d_factory/Makefile.in b/internal/test_util/libcode/vx_data2d_factory/Makefile.in index fc47b90c40..3a138d8f8a 100644 --- a/internal/test_util/libcode/vx_data2d_factory/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_factory/Makefile.in @@ -219,11 +219,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/libcode/vx_data2d_grib/Makefile.in b/internal/test_util/libcode/vx_data2d_grib/Makefile.in index 7d3461c0c5..8bc11a2c64 100644 --- a/internal/test_util/libcode/vx_data2d_grib/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_grib/Makefile.in @@ -212,11 +212,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in index 372ccf3a8c..50622e97a4 100644 --- a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in @@ -213,11 +213,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in index f86958db2c..a4cb6aee34 100644 --- a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in @@ -211,11 +211,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/libcode/vx_geodesy/Makefile.in b/internal/test_util/libcode/vx_geodesy/Makefile.in index f006dc86c7..c8ab53472e 100644 --- a/internal/test_util/libcode/vx_geodesy/Makefile.in +++ b/internal/test_util/libcode/vx_geodesy/Makefile.in @@ -211,11 +211,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/libcode/vx_grid/Makefile.in b/internal/test_util/libcode/vx_grid/Makefile.in index ae2a4383d0..c71c31fe3a 100644 --- a/internal/test_util/libcode/vx_grid/Makefile.in +++ b/internal/test_util/libcode/vx_grid/Makefile.in @@ -211,11 +211,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/libcode/vx_nc_util/Makefile.in b/internal/test_util/libcode/vx_nc_util/Makefile.in index f437196d7f..af88cc911e 100644 --- a/internal/test_util/libcode/vx_nc_util/Makefile.in +++ b/internal/test_util/libcode/vx_nc_util/Makefile.in @@ -216,11 +216,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/libcode/vx_physics/Makefile.in b/internal/test_util/libcode/vx_physics/Makefile.in index ddd63db625..d143950ec0 100644 --- a/internal/test_util/libcode/vx_physics/Makefile.in +++ b/internal/test_util/libcode/vx_physics/Makefile.in @@ -211,11 +211,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/libcode/vx_plot_util/Makefile.in b/internal/test_util/libcode/vx_plot_util/Makefile.in index 8aa88eed23..124ef8267a 100644 --- a/internal/test_util/libcode/vx_plot_util/Makefile.in +++ b/internal/test_util/libcode/vx_plot_util/Makefile.in @@ -212,11 +212,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/libcode/vx_ps/Makefile.in b/internal/test_util/libcode/vx_ps/Makefile.in index 17081679e8..9504c16408 100644 --- a/internal/test_util/libcode/vx_ps/Makefile.in +++ b/internal/test_util/libcode/vx_ps/Makefile.in @@ -211,11 +211,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/libcode/vx_series_data/Makefile.in b/internal/test_util/libcode/vx_series_data/Makefile.in index 6cf8e84616..96a4853479 100644 --- a/internal/test_util/libcode/vx_series_data/Makefile.in +++ b/internal/test_util/libcode/vx_series_data/Makefile.in @@ -213,11 +213,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/libcode/vx_solar/Makefile.in b/internal/test_util/libcode/vx_solar/Makefile.in index 1233b23042..8251c7948c 100644 --- a/internal/test_util/libcode/vx_solar/Makefile.in +++ b/internal/test_util/libcode/vx_solar/Makefile.in @@ -211,11 +211,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/libcode/vx_tc_util/Makefile.in b/internal/test_util/libcode/vx_tc_util/Makefile.in index 9c1cef30d3..a4a1f5c0c7 100644 --- a/internal/test_util/libcode/vx_tc_util/Makefile.in +++ b/internal/test_util/libcode/vx_tc_util/Makefile.in @@ -221,11 +221,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/tools/Makefile.in b/internal/test_util/tools/Makefile.in index 186c0537e1..3d6548c6b4 100644 --- a/internal/test_util/tools/Makefile.in +++ b/internal/test_util/tools/Makefile.in @@ -223,11 +223,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/tools/other/Makefile.in b/internal/test_util/tools/other/Makefile.in index 035eb82c4c..4a79bd205f 100644 --- a/internal/test_util/tools/other/Makefile.in +++ b/internal/test_util/tools/other/Makefile.in @@ -223,11 +223,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/internal/test_util/tools/other/mode_time_domain/Makefile.in b/internal/test_util/tools/other/mode_time_domain/Makefile.in index c18289e08a..5fa5c7d34f 100644 --- a/internal/test_util/tools/other/mode_time_domain/Makefile.in +++ b/internal/test_util/tools/other/mode_time_domain/Makefile.in @@ -236,11 +236,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/scripts/Rscripts/Makefile.in b/scripts/Rscripts/Makefile.in index 2acf818e34..8f010abdf9 100644 --- a/scripts/Rscripts/Makefile.in +++ b/scripts/Rscripts/Makefile.in @@ -253,11 +253,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/scripts/Rscripts/include/Makefile.in b/scripts/Rscripts/include/Makefile.in index 7f8f6b245c..86e7fbd9c4 100644 --- a/scripts/Rscripts/include/Makefile.in +++ b/scripts/Rscripts/include/Makefile.in @@ -193,11 +193,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/scripts/python/Makefile.in b/scripts/python/Makefile.in index 02691c4f09..b4e0d57d3a 100644 --- a/scripts/python/Makefile.in +++ b/scripts/python/Makefile.in @@ -225,11 +225,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/scripts/python/examples/Makefile.in b/scripts/python/examples/Makefile.in index 3abe6fdead..fa55168ccf 100644 --- a/scripts/python/examples/Makefile.in +++ b/scripts/python/examples/Makefile.in @@ -195,11 +195,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/scripts/python/met/Makefile.in b/scripts/python/met/Makefile.in index b8663fcdac..e9b4f8ce79 100644 --- a/scripts/python/met/Makefile.in +++ b/scripts/python/met/Makefile.in @@ -195,11 +195,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/scripts/python/pyembed/Makefile.in b/scripts/python/pyembed/Makefile.in index d5641b6a8e..b56b809961 100644 --- a/scripts/python/pyembed/Makefile.in +++ b/scripts/python/pyembed/Makefile.in @@ -253,11 +253,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/scripts/python/tc_diag/Makefile.in b/scripts/python/tc_diag/Makefile.in index a092039006..becca2dbd4 100644 --- a/scripts/python/tc_diag/Makefile.in +++ b/scripts/python/tc_diag/Makefile.in @@ -195,11 +195,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/scripts/python/utility/Makefile.in b/scripts/python/utility/Makefile.in index a51225a41e..742a8ab19c 100644 --- a/scripts/python/utility/Makefile.in +++ b/scripts/python/utility/Makefile.in @@ -195,11 +195,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/Makefile.in b/src/Makefile.in index 25afc196c7..8417fa4e17 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -223,11 +223,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/basic/Makefile.in b/src/basic/Makefile.in index 77eeeedf8f..a9b55ed34b 100644 --- a/src/basic/Makefile.in +++ b/src/basic/Makefile.in @@ -225,11 +225,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/basic/enum_to_string/Makefile.in b/src/basic/enum_to_string/Makefile.in index d0e76d5e05..65a212669a 100644 --- a/src/basic/enum_to_string/Makefile.in +++ b/src/basic/enum_to_string/Makefile.in @@ -242,11 +242,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/basic/vx_cal/Makefile.in b/src/basic/vx_cal/Makefile.in index f23327226c..c69eee1b29 100644 --- a/src/basic/vx_cal/Makefile.in +++ b/src/basic/vx_cal/Makefile.in @@ -249,11 +249,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/basic/vx_config/Makefile.in b/src/basic/vx_config/Makefile.in index 3d6af85624..28e6d856af 100644 --- a/src/basic/vx_config/Makefile.in +++ b/src/basic/vx_config/Makefile.in @@ -297,11 +297,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/basic/vx_log/Makefile.in b/src/basic/vx_log/Makefile.in index 13b0b73efa..9f8cc0f0c8 100644 --- a/src/basic/vx_log/Makefile.in +++ b/src/basic/vx_log/Makefile.in @@ -228,11 +228,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/basic/vx_math/Makefile.in b/src/basic/vx_math/Makefile.in index b185c4c3db..f001e29200 100644 --- a/src/basic/vx_math/Makefile.in +++ b/src/basic/vx_math/Makefile.in @@ -242,11 +242,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/basic/vx_util/Makefile.in b/src/basic/vx_util/Makefile.in index 43939400f7..a6ed156465 100644 --- a/src/basic/vx_util/Makefile.in +++ b/src/basic/vx_util/Makefile.in @@ -347,11 +347,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/basic/vx_util_math/Makefile.in b/src/basic/vx_util_math/Makefile.in index bc7f62bd82..6e8aeed609 100644 --- a/src/basic/vx_util_math/Makefile.in +++ b/src/basic/vx_util_math/Makefile.in @@ -227,11 +227,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_afm/Makefile.in b/src/libcode/vx_afm/Makefile.in index a42770282c..6ec7f7b88e 100644 --- a/src/libcode/vx_afm/Makefile.in +++ b/src/libcode/vx_afm/Makefile.in @@ -236,11 +236,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_analysis_util/Makefile.in b/src/libcode/vx_analysis_util/Makefile.in index 22227b0c6a..df6b173c08 100644 --- a/src/libcode/vx_analysis_util/Makefile.in +++ b/src/libcode/vx_analysis_util/Makefile.in @@ -243,11 +243,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_bool_calc/Makefile.in b/src/libcode/vx_bool_calc/Makefile.in index b541ca6b87..80d009ee76 100644 --- a/src/libcode/vx_bool_calc/Makefile.in +++ b/src/libcode/vx_bool_calc/Makefile.in @@ -238,11 +238,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_color/Makefile.in b/src/libcode/vx_color/Makefile.in index 7558c1599e..7fc3b7a932 100644 --- a/src/libcode/vx_color/Makefile.in +++ b/src/libcode/vx_color/Makefile.in @@ -255,11 +255,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_data2d/Makefile.in b/src/libcode/vx_data2d/Makefile.in index f1f052dea3..e6c1312a73 100644 --- a/src/libcode/vx_data2d/Makefile.in +++ b/src/libcode/vx_data2d/Makefile.in @@ -238,11 +238,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_data2d_factory/Makefile.in b/src/libcode/vx_data2d_factory/Makefile.in index f0974875f2..cd89907d00 100644 --- a/src/libcode/vx_data2d_factory/Makefile.in +++ b/src/libcode/vx_data2d_factory/Makefile.in @@ -241,11 +241,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_data2d_grib/Makefile.in b/src/libcode/vx_data2d_grib/Makefile.in index 4e2468fb76..1f6ddea311 100644 --- a/src/libcode/vx_data2d_grib/Makefile.in +++ b/src/libcode/vx_data2d_grib/Makefile.in @@ -238,11 +238,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_data2d_grib2/Makefile.in b/src/libcode/vx_data2d_grib2/Makefile.in index f3fbbcc006..60aa0172fe 100644 --- a/src/libcode/vx_data2d_grib2/Makefile.in +++ b/src/libcode/vx_data2d_grib2/Makefile.in @@ -231,11 +231,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_data2d_nc_met/Makefile.in b/src/libcode/vx_data2d_nc_met/Makefile.in index 18878c25f7..1b1e5383c7 100644 --- a/src/libcode/vx_data2d_nc_met/Makefile.in +++ b/src/libcode/vx_data2d_nc_met/Makefile.in @@ -235,11 +235,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_data2d_nc_pinterp/Makefile.in b/src/libcode/vx_data2d_nc_pinterp/Makefile.in index 989068ea4d..89bc962bca 100644 --- a/src/libcode/vx_data2d_nc_pinterp/Makefile.in +++ b/src/libcode/vx_data2d_nc_pinterp/Makefile.in @@ -236,11 +236,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_data2d_nccf/Makefile.in b/src/libcode/vx_data2d_nccf/Makefile.in index 9f8ca6f73e..a3a0f4d0ed 100644 --- a/src/libcode/vx_data2d_nccf/Makefile.in +++ b/src/libcode/vx_data2d_nccf/Makefile.in @@ -232,11 +232,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_data2d_python/Makefile.in b/src/libcode/vx_data2d_python/Makefile.in index bfc7060cd1..3c467c5537 100644 --- a/src/libcode/vx_data2d_python/Makefile.in +++ b/src/libcode/vx_data2d_python/Makefile.in @@ -239,11 +239,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_geodesy/Makefile.in b/src/libcode/vx_geodesy/Makefile.in index eda413d780..448e181f45 100644 --- a/src/libcode/vx_geodesy/Makefile.in +++ b/src/libcode/vx_geodesy/Makefile.in @@ -227,11 +227,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_gis/Makefile.in b/src/libcode/vx_gis/Makefile.in index 412cd006f3..7495bbd234 100644 --- a/src/libcode/vx_gis/Makefile.in +++ b/src/libcode/vx_gis/Makefile.in @@ -236,11 +236,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_gnomon/Makefile.in b/src/libcode/vx_gnomon/Makefile.in index 3086a47bbf..3ad85156d0 100644 --- a/src/libcode/vx_gnomon/Makefile.in +++ b/src/libcode/vx_gnomon/Makefile.in @@ -227,11 +227,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_gsl_prob/Makefile.in b/src/libcode/vx_gsl_prob/Makefile.in index b60c9f0e09..28b6b34c66 100644 --- a/src/libcode/vx_gsl_prob/Makefile.in +++ b/src/libcode/vx_gsl_prob/Makefile.in @@ -235,11 +235,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_nav/Makefile.in b/src/libcode/vx_nav/Makefile.in index 468226f6b9..e9c6000d9e 100644 --- a/src/libcode/vx_nav/Makefile.in +++ b/src/libcode/vx_nav/Makefile.in @@ -227,11 +227,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_nc_obs/Makefile.in b/src/libcode/vx_nc_obs/Makefile.in index 2ef201b449..eea1f18b80 100644 --- a/src/libcode/vx_nc_obs/Makefile.in +++ b/src/libcode/vx_nc_obs/Makefile.in @@ -237,11 +237,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_nc_util/Makefile.in b/src/libcode/vx_nc_util/Makefile.in index 81fbd40a9f..7011be53ef 100644 --- a/src/libcode/vx_nc_util/Makefile.in +++ b/src/libcode/vx_nc_util/Makefile.in @@ -235,11 +235,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_pb_util/Makefile.in b/src/libcode/vx_pb_util/Makefile.in index b88c641dc2..28d69c3aed 100644 --- a/src/libcode/vx_pb_util/Makefile.in +++ b/src/libcode/vx_pb_util/Makefile.in @@ -233,11 +233,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_physics/Makefile.in b/src/libcode/vx_physics/Makefile.in index 20b84ee14d..3cf64e206c 100644 --- a/src/libcode/vx_physics/Makefile.in +++ b/src/libcode/vx_physics/Makefile.in @@ -227,11 +227,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_plot_util/Makefile.in b/src/libcode/vx_plot_util/Makefile.in index b071eb2b54..3f15ce88ed 100644 --- a/src/libcode/vx_plot_util/Makefile.in +++ b/src/libcode/vx_plot_util/Makefile.in @@ -232,11 +232,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_pointdata_python/Makefile.in b/src/libcode/vx_pointdata_python/Makefile.in index 93da42dfd2..f771d8b2d6 100644 --- a/src/libcode/vx_pointdata_python/Makefile.in +++ b/src/libcode/vx_pointdata_python/Makefile.in @@ -236,11 +236,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_ps/Makefile.in b/src/libcode/vx_ps/Makefile.in index 517daf49df..08d215f0c0 100644 --- a/src/libcode/vx_ps/Makefile.in +++ b/src/libcode/vx_ps/Makefile.in @@ -237,11 +237,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_pxm/Makefile.in b/src/libcode/vx_pxm/Makefile.in index 626c404f1e..330d3774f4 100644 --- a/src/libcode/vx_pxm/Makefile.in +++ b/src/libcode/vx_pxm/Makefile.in @@ -234,11 +234,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_python3_utils/Makefile.in b/src/libcode/vx_python3_utils/Makefile.in index bf1839f2b6..c46bdf0b66 100644 --- a/src/libcode/vx_python3_utils/Makefile.in +++ b/src/libcode/vx_python3_utils/Makefile.in @@ -240,11 +240,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_regrid/Makefile.in b/src/libcode/vx_regrid/Makefile.in index 78c1e849c8..e2c47ce6eb 100644 --- a/src/libcode/vx_regrid/Makefile.in +++ b/src/libcode/vx_regrid/Makefile.in @@ -229,11 +229,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_render/Makefile.in b/src/libcode/vx_render/Makefile.in index b3f2ee31bf..d1a60e05b7 100644 --- a/src/libcode/vx_render/Makefile.in +++ b/src/libcode/vx_render/Makefile.in @@ -251,11 +251,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_seeps/Makefile.in b/src/libcode/vx_seeps/Makefile.in index 7334c459d4..6c478aac10 100644 --- a/src/libcode/vx_seeps/Makefile.in +++ b/src/libcode/vx_seeps/Makefile.in @@ -227,11 +227,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_series_data/Makefile.in b/src/libcode/vx_series_data/Makefile.in index d4a9153226..f28c0cc1d0 100644 --- a/src/libcode/vx_series_data/Makefile.in +++ b/src/libcode/vx_series_data/Makefile.in @@ -230,11 +230,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_shapedata/Makefile.in b/src/libcode/vx_shapedata/Makefile.in index 41bf90d9d3..3d4cd33834 100644 --- a/src/libcode/vx_shapedata/Makefile.in +++ b/src/libcode/vx_shapedata/Makefile.in @@ -243,11 +243,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_solar/Makefile.in b/src/libcode/vx_solar/Makefile.in index 1c28bf8c32..7634751d27 100644 --- a/src/libcode/vx_solar/Makefile.in +++ b/src/libcode/vx_solar/Makefile.in @@ -229,11 +229,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_stat_out/Makefile.in b/src/libcode/vx_stat_out/Makefile.in index a3f53c5973..ec9705a279 100644 --- a/src/libcode/vx_stat_out/Makefile.in +++ b/src/libcode/vx_stat_out/Makefile.in @@ -229,11 +229,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_statistics/Makefile.in b/src/libcode/vx_statistics/Makefile.in index 64ba6edd5e..974b7e3a05 100644 --- a/src/libcode/vx_statistics/Makefile.in +++ b/src/libcode/vx_statistics/Makefile.in @@ -254,11 +254,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_summary/Makefile.in b/src/libcode/vx_summary/Makefile.in index fa86db187b..9c54b2d05f 100644 --- a/src/libcode/vx_summary/Makefile.in +++ b/src/libcode/vx_summary/Makefile.in @@ -249,11 +249,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_tc_util/Makefile.in b/src/libcode/vx_tc_util/Makefile.in index c1c10aa2ad..4475e10a65 100644 --- a/src/libcode/vx_tc_util/Makefile.in +++ b/src/libcode/vx_tc_util/Makefile.in @@ -263,11 +263,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/libcode/vx_time_series/Makefile.in b/src/libcode/vx_time_series/Makefile.in index 92e35e0d53..e515200d41 100644 --- a/src/libcode/vx_time_series/Makefile.in +++ b/src/libcode/vx_time_series/Makefile.in @@ -231,11 +231,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ From 8922f73064b4fe136c74052032a591d7d6e0880d Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 12 Sep 2023 10:39:22 -0600 Subject: [PATCH 006/109] #2231 Added FileType_UGrid --- src/basic/vx_config/data_file_type.h | 1 + src/basic/vx_config/grdfiletype_to_string.cc | 12 +++++++----- src/libcode/vx_data2d_factory/data2d_factory.cc | 12 +++++++++--- src/libcode/vx_data2d_factory/var_info_factory.cc | 5 +++++ 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/basic/vx_config/data_file_type.h b/src/basic/vx_config/data_file_type.h index 9d43e6faca..f9f6fa7c24 100644 --- a/src/basic/vx_config/data_file_type.h +++ b/src/basic/vx_config/data_file_type.h @@ -36,6 +36,7 @@ enum GrdFileType FileType_Python_Numpy, // python script using numpy array and attributes dictionary FileType_Python_Xarray, // python script using xarray dataplane + FileType_UGrid, // Unstructured grid }; diff --git a/src/basic/vx_config/grdfiletype_to_string.cc b/src/basic/vx_config/grdfiletype_to_string.cc index 8c192183a1..0b802b97ab 100644 --- a/src/basic/vx_config/grdfiletype_to_string.cc +++ b/src/basic/vx_config/grdfiletype_to_string.cc @@ -24,12 +24,12 @@ //////////////////////////////////////////////////////////////////////// -#include +using namespace std; -#include "grdfiletype_to_string.h" +#include -using namespace std; +#include "grdfiletype_to_string.h" //////////////////////////////////////////////////////////////////////// @@ -56,6 +56,7 @@ switch ( t ) { case FileType_Python_Numpy: s = "FileType_Python_Numpy"; break; case FileType_Python_Xarray: s = "FileType_Python_Xarray"; break; + case FileType_UGrid: s = "FileType_UGrid"; break; default: s = "(bad value)"; @@ -64,7 +65,7 @@ switch ( t ) { } // switch -return ConcatString (s); +return ( ConcatString (s) ); } @@ -89,11 +90,12 @@ else if ( strcmp(text, "FileType_Bufr" ) == 0 ) { t = FileType_Bufr; else if ( strcmp(text, "FileType_Python_Numpy" ) == 0 ) { t = FileType_Python_Numpy; return ( true ); } else if ( strcmp(text, "FileType_Python_Xarray" ) == 0 ) { t = FileType_Python_Xarray; return ( true ); } +else if ( strcmp(text, "FileType_UGrid" ) == 0 ) { t = FileType_UGrid; return ( true ); } // // nope // -return false; +return ( false ); } diff --git a/src/libcode/vx_data2d_factory/data2d_factory.cc b/src/libcode/vx_data2d_factory/data2d_factory.cc index 0c292521b5..90679c72c8 100644 --- a/src/libcode/vx_data2d_factory/data2d_factory.cc +++ b/src/libcode/vx_data2d_factory/data2d_factory.cc @@ -23,6 +23,7 @@ using namespace std; #include "data2d_nc_met.h" #include "data2d_nc_pinterp.h" #include "data2d_nccf.h" +#include "data2d_ugrid.h" #ifdef WITH_PYTHON @@ -45,10 +46,10 @@ Met2dDataFile * Met2dDataFileFactory::new_met_2d_data_file(GrdFileType type) { - Met2dDataFile *mtddf = (Met2dDataFile *) 0; + Met2dDataFile *mtddf = (Met2dDataFile *) nullptr; #ifdef WITH_PYTHON -MetPythonDataFile * p = 0; +MetPythonDataFile * p = nullptr; #endif // @@ -122,9 +123,14 @@ MetPythonDataFile * p = 0; << grdfiletype_to_string(type) << "\"\n\n"; exit(1); + case FileType_UGrid: + // For FileType_None, silently return a nullptr pointer + mtddf = new MetUGridDataFile; + break; + case FileType_None: // For FileType_None, silently return a nullptr pointer - mtddf = (Met2dDataFile *) 0; + mtddf = (Met2dDataFile *) nullptr; break; default: diff --git a/src/libcode/vx_data2d_factory/var_info_factory.cc b/src/libcode/vx_data2d_factory/var_info_factory.cc index d82a74a8ad..5e37d76805 100644 --- a/src/libcode/vx_data2d_factory/var_info_factory.cc +++ b/src/libcode/vx_data2d_factory/var_info_factory.cc @@ -29,6 +29,7 @@ using namespace std; #include "var_info_nccf.h" #include "var_info_nc_met.h" #include "var_info_nc_pinterp.h" +#include "var_info_ugrid.h" #ifdef WITH_PYTHON #include "var_info_python.h" @@ -103,6 +104,10 @@ VarInfo * VarInfoFactory::new_var_info(GrdFileType type) vi = new VarInfoNcCF; break; + case FileType_UGrid: + vi = new VarInfoUGrid; + break; + case FileType_HdfEos: mlog << Error << "\nVarInfoFactory::new_var_info() -> " << "Support for GrdFileType = " << grdfiletype_to_string(type) From c4c64c5f84c172be3fd85a69918291ab38ac8a13 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 12 Sep 2023 10:40:43 -0600 Subject: [PATCH 007/109] #2231 Added MET_ATLAS, MET_ECKIT, and vx_data2d_ugrid --- src/libcode/Makefile.am | 1 + src/libcode/Makefile.in | 30 ++++++++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/libcode/Makefile.am b/src/libcode/Makefile.am index b22ff5ea90..e53020ed8a 100644 --- a/src/libcode/Makefile.am +++ b/src/libcode/Makefile.am @@ -22,6 +22,7 @@ SUBDIRS = vx_grid \ vx_data2d_grib \ vx_data2d_nc_met \ vx_data2d_nccf \ + vx_data2d_ugrid \ vx_data2d_nc_pinterp if ENABLE_PYTHON diff --git a/src/libcode/Makefile.in b/src/libcode/Makefile.in index 7e35d744ef..abfb5fd571 100644 --- a/src/libcode/Makefile.in +++ b/src/libcode/Makefile.in @@ -155,14 +155,14 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = vx_grid vx_data2d vx_nc_util vx_data2d_grib \ - vx_data2d_nc_met vx_data2d_nccf vx_data2d_nc_pinterp \ - vx_python3_utils vx_data2d_python vx_pointdata_python \ - vx_data2d_grib2 vx_data2d_factory vx_gsl_prob vx_gnomon \ - vx_geodesy vx_gis vx_nav vx_pb_util vx_afm vx_color vx_pxm \ - vx_render vx_ps vx_plot_util vx_shapedata vx_statistics \ - vx_stat_out vx_analysis_util vx_tc_util vx_summary \ - vx_time_series vx_physics vx_series_data vx_regrid vx_nc_obs \ - vx_solar vx_bool_calc vx_seeps + vx_data2d_nc_met vx_data2d_nccf vx_data2d_ugrid \ + vx_data2d_nc_pinterp vx_python3_utils vx_data2d_python \ + vx_pointdata_python vx_data2d_grib2 vx_data2d_factory \ + vx_gsl_prob vx_gnomon vx_geodesy vx_gis vx_nav vx_pb_util \ + vx_afm vx_color vx_pxm vx_render vx_ps vx_plot_util \ + vx_shapedata vx_statistics vx_stat_out vx_analysis_util \ + vx_tc_util vx_summary vx_time_series vx_physics vx_series_data \ + vx_regrid vx_nc_obs vx_solar vx_bool_calc vx_seeps am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ @@ -234,11 +234,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -339,10 +345,10 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = vx_grid vx_data2d vx_nc_util vx_data2d_grib vx_data2d_nc_met \ - vx_data2d_nccf vx_data2d_nc_pinterp $(am__append_1) \ - $(am__append_2) vx_data2d_factory vx_gsl_prob vx_gnomon \ - vx_geodesy vx_gis vx_nav vx_pb_util vx_afm vx_color vx_pxm \ - vx_render vx_ps vx_plot_util vx_shapedata vx_statistics \ + vx_data2d_nccf vx_data2d_ugrid vx_data2d_nc_pinterp \ + $(am__append_1) $(am__append_2) vx_data2d_factory vx_gsl_prob \ + vx_gnomon vx_geodesy vx_gis vx_nav vx_pb_util vx_afm vx_color \ + vx_pxm vx_render vx_ps vx_plot_util vx_shapedata vx_statistics \ vx_stat_out vx_analysis_util vx_tc_util vx_summary \ vx_time_series vx_physics vx_series_data vx_regrid vx_nc_obs \ vx_solar vx_bool_calc vx_seeps From 586a79382ce8601b60e780b5584ccd96edc10af3 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 12 Sep 2023 10:41:41 -0600 Subject: [PATCH 008/109] #2231 Cleanup for sonarqube --- src/libcode/vx_data2d_nccf/data2d_nccf.cc | 7 +++---- src/libcode/vx_data2d_nccf/data2d_nccf.h | 2 +- src/libcode/vx_data2d_nccf/nccf_file.h | 8 ++++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/libcode/vx_data2d_nccf/data2d_nccf.cc b/src/libcode/vx_data2d_nccf/data2d_nccf.cc index f8b251c6d1..d25a1062c7 100644 --- a/src/libcode/vx_data2d_nccf/data2d_nccf.cc +++ b/src/libcode/vx_data2d_nccf/data2d_nccf.cc @@ -10,20 +10,20 @@ //////////////////////////////////////////////////////////////////////// -using namespace std; - #include #include #include #include #include -using namespace netCDF; #include "data2d_nccf.h" #include "vx_math.h" #include "vx_log.h" +using namespace std; +using namespace netCDF; + //////////////////////////////////////////////////////////////////////// static const int error_code_no_error = 0; @@ -352,7 +352,6 @@ int MetNcCFDataFile::data_plane_array(VarInfo &vinfo, LongArray time_offsets = collect_time_offsets(vinfo); if (0 < time_offsets.n_elements()) { LevelInfo level = vinfo.level(); - VarInfoNcCF *vinfo_nc = (VarInfoNcCF *)&vinfo; long time_lower = bad_data_int; long time_upper = bad_data_int; if (level.type() == LevelType_Time) { diff --git a/src/libcode/vx_data2d_nccf/data2d_nccf.h b/src/libcode/vx_data2d_nccf/data2d_nccf.h index d9a9a2df9c..9e33bf909b 100644 --- a/src/libcode/vx_data2d_nccf/data2d_nccf.h +++ b/src/libcode/vx_data2d_nccf/data2d_nccf.h @@ -34,7 +34,7 @@ class MetNcCFDataFile : public Met2dDataFile { void nccf_init_from_scratch(); NcVarInfo *find_first_data_var(); long convert_time_to_offset(long time_value); - long convert_value_to_offset(double z_value, string z_dim_name); + long convert_value_to_offset(double z_value, std::string z_dim_name); LongArray collect_time_offsets(VarInfo &vinfo); MetNcCFDataFile(const MetNcCFDataFile &); diff --git a/src/libcode/vx_data2d_nccf/nccf_file.h b/src/libcode/vx_data2d_nccf/nccf_file.h index c43f4b535b..fde3b48e28 100644 --- a/src/libcode/vx_data2d_nccf/nccf_file.h +++ b/src/libcode/vx_data2d_nccf/nccf_file.h @@ -150,10 +150,10 @@ class NcCfFile { // Determine the file times from the filename - unixtime get_valid_time_from_file_path(const string &filepath) const; - unixtime get_init_time_from_file_path(const string &filepath) const; - unixtime get_time_from_TRMM_3B42_3hourly_filename(const string &filename) const; - unixtime get_time_from_TRMM_3B42_daily_filename(const string &filename) const; + unixtime get_valid_time_from_file_path(const std::string &filepath) const; + unixtime get_init_time_from_file_path(const std::string &filepath) const; + unixtime get_time_from_TRMM_3B42_3hourly_filename(const std::string &filename) const; + unixtime get_time_from_TRMM_3B42_daily_filename(const std::string &filename) const; // Read the grid information from the netCDF file and fill in the From aeefa279fc951201ae27b1e3449a0be424f1f46b Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 12 Sep 2023 10:42:49 -0600 Subject: [PATCH 009/109] Added UnstructuredData --- src/libcode/vx_grid/grid_base.cc | 265 ++++++++++++++++++++----------- src/libcode/vx_grid/grid_base.h | 8 +- 2 files changed, 182 insertions(+), 91 deletions(-) diff --git a/src/libcode/vx_grid/grid_base.cc b/src/libcode/vx_grid/grid_base.cc index 9e5dd32607..7103f8da6c 100644 --- a/src/libcode/vx_grid/grid_base.cc +++ b/src/libcode/vx_grid/grid_base.cc @@ -34,7 +34,7 @@ static const int grid_debug_level = 4; /////////////////////////////////////////////////////////////////////////////// -inline bool is_even(int k) { return ( (k%2) == 0 ); } +inline bool is_even(int k) { return (k%2) == 0; } //////////////////////////////////////////////////////////////////////// @@ -292,7 +292,7 @@ void SemiLatLonData::clear() { -name = (const char *) 0; +name = (const char *) nullptr; lats.clear(); lons.clear(); @@ -302,6 +302,34 @@ times.clear(); } +//////////////////////////////////////////////////////////////////////// + +void UnstructuredData::clear() { + + name = (const char *) nullptr; + + Nface = 0; + pointLonLat.clear(); + if (kdtree) { delete kdtree; kdtree = nullptr; } + +} + + +//////////////////////////////////////////////////////////////////////// + + +void UnstructuredData::dump() const { + + mlog << Debug(grid_debug_level) + << "\nUnstructured Grid Data:\n" +// << " lats: " << lats.summarize() << "\n" +// << " lons: " << lons.summarize() << "\n" +// << " levels: " << levels.summarize() << "\n" +// << " times: " << times.summarize() << "\n\n"; + ; +} + + //////////////////////////////////////////////////////////////////////// @@ -355,11 +383,9 @@ GridInfo & GridInfo::operator=(const GridInfo & info) { -if ( this == &info ) return ( * this ); - -assign(info); +if ( this != &info ) assign(info); -return ( * this ); +return *this; } @@ -371,16 +397,17 @@ void GridInfo::init_from_scratch() { -lc = (const LambertData *) 0; -st = (const StereographicData *) 0; -ll = (const LatLonData *) 0; -rll = (const RotatedLatLonData *) 0; -m = (const MercatorData *) 0; -g = (const GaussianData *) 0; -gi = (const GoesImagerData *) 0; -la = (const LaeaData *) 0; -tc = (const TcrmwData *) 0; -sl = (const SemiLatLonData *) 0; +lc = (const LambertData *) nullptr; +st = (const StereographicData *) nullptr; +ll = (const LatLonData *) nullptr; +rll = (const RotatedLatLonData *) nullptr; +m = (const MercatorData *) nullptr; +g = (const GaussianData *) nullptr; +gi = (const GoesImagerData *) nullptr; +la = (const LaeaData *) nullptr; +tc = (const TcrmwData *) nullptr; +sl = (const SemiLatLonData *) nullptr; +us = (const UnstructuredData *) nullptr; clear(); @@ -396,16 +423,17 @@ void GridInfo::clear() { -if ( lc ) { delete lc; lc = (const LambertData *) 0; }; -if ( st ) { delete st; st = (const StereographicData *) 0; }; -if ( ll ) { delete ll; ll = (const LatLonData *) 0; }; -if ( rll ) { delete rll; rll = (const RotatedLatLonData *) 0; }; -if ( m ) { delete m; m = (const MercatorData *) 0; }; -if ( g ) { delete g; g = (const GaussianData *) 0; }; -if ( gi ) { delete gi; gi = (const GoesImagerData *) 0; }; -if ( la ) { delete la; la = (const LaeaData *) 0; }; -if ( tc ) { delete tc; tc = (const TcrmwData *) 0; }; -if ( sl ) { delete sl; sl = (const SemiLatLonData *) 0; }; +if ( lc ) { delete lc; lc = (const LambertData *) nullptr; }; +if ( st ) { delete st; st = (const StereographicData *) nullptr; }; +if ( ll ) { delete ll; ll = (const LatLonData *) nullptr; }; +if ( rll ) { delete rll; rll = (const RotatedLatLonData *) nullptr; }; +if ( m ) { delete m; m = (const MercatorData *) nullptr; }; +if ( g ) { delete g; g = (const GaussianData *) nullptr; }; +if ( gi ) { delete gi; gi = (const GoesImagerData *) nullptr; }; +if ( la ) { delete la; la = (const LaeaData *) nullptr; }; +if ( tc ) { delete tc; tc = (const TcrmwData *) nullptr; }; +if ( sl ) { delete sl; sl = (const SemiLatLonData *) nullptr; }; +if ( us ) { delete us; us = (const UnstructuredData *) nullptr; }; return; @@ -428,6 +456,7 @@ if ( info.g ) set( *(info.g) ); if ( info.gi ) set( *(info.gi) ); if ( info.la ) set( *(info.la) ); if ( info.sl ) set( *(info.sl) ); +if ( info.us ) set( *(info.us) ); return; @@ -452,8 +481,9 @@ if ( g ) ++count; if ( gi ) ++count; if ( la ) ++count; if ( sl ) ++count; +if ( us ) ++count; -return ( count == 1 ); +return count == 1; } @@ -482,6 +512,7 @@ else if ( g ) gg.set( *g ); else if ( gi ) gg.set( *gi ); else if ( la ) gg.set( *la ); else if ( sl ) gg.set( *sl ); +else if ( us ) gg.set( *us ); return; @@ -497,13 +528,13 @@ void GridInfo::set(const LambertData & data) clear(); -LambertData * D = (LambertData *) 0; +LambertData * D = (LambertData *) nullptr; D = new LambertData; memcpy(D, &data, sizeof(data)); -lc = D; D = (LambertData *) 0; +lc = D; D = (LambertData *) nullptr; return; @@ -519,13 +550,13 @@ void GridInfo::set(const StereographicData & data) clear(); -StereographicData * D = (StereographicData *) 0; +StereographicData * D = (StereographicData *) nullptr; D = new StereographicData; memcpy(D, &data, sizeof(data)); -st = D; D = (StereographicData *) 0; +st = D; D = (StereographicData *) nullptr; return; @@ -541,13 +572,13 @@ void GridInfo::set(const LatLonData & data) clear(); -LatLonData * D = (LatLonData *) 0; +LatLonData * D = (LatLonData *) nullptr; D = new LatLonData; memcpy(D, &data, sizeof(data)); -ll = D; D = (LatLonData *) 0; +ll = D; D = (LatLonData *) nullptr; return; @@ -563,13 +594,13 @@ void GridInfo::set(const RotatedLatLonData & data) clear(); -RotatedLatLonData * D = (RotatedLatLonData *) 0; +RotatedLatLonData * D = (RotatedLatLonData *) nullptr; D = new RotatedLatLonData; memcpy(D, &data, sizeof(data)); -rll = D; D = (RotatedLatLonData *) 0; +rll = D; D = (RotatedLatLonData *) nullptr; return; @@ -585,13 +616,13 @@ void GridInfo::set(const MercatorData & data) clear(); -MercatorData * D = (MercatorData *) 0; +MercatorData * D = (MercatorData *) nullptr; D = new MercatorData; memcpy(D, &data, sizeof(data)); -m = D; D = (MercatorData *) 0; +m = D; D = (MercatorData *) nullptr; return; @@ -607,13 +638,13 @@ void GridInfo::set(const GaussianData & data) clear(); -GaussianData * D = (GaussianData *) 0; +GaussianData * D = (GaussianData *) nullptr; D = new GaussianData; memcpy(D, &data, sizeof(data)); -g = D; D = (GaussianData *) 0; +g = D; D = (GaussianData *) nullptr; return; @@ -629,13 +660,13 @@ void GridInfo::set(const GoesImagerData & data) clear(); -GoesImagerData * D = (GoesImagerData *) 0; +GoesImagerData * D = (GoesImagerData *) nullptr; D = new GoesImagerData; memcpy(D, &data, sizeof(data)); -gi = D; D = (GoesImagerData *) 0; +gi = D; D = (GoesImagerData *) nullptr; return; @@ -651,13 +682,13 @@ void GridInfo::set(const LaeaData & data) clear(); -LaeaData * D = (LaeaData *) 0; +LaeaData * D = (LaeaData *) nullptr; D = new LaeaData; memcpy(D, &data, sizeof(data)); -la = D; D = (LaeaData *) 0; +la = D; D = (LaeaData *) nullptr; return; @@ -673,7 +704,7 @@ void GridInfo::set(const SemiLatLonData & data) clear(); -SemiLatLonData * D = (SemiLatLonData *) 0; +SemiLatLonData * D = (SemiLatLonData *) nullptr; D = new SemiLatLonData; @@ -684,13 +715,40 @@ D = new SemiLatLonData; *D = data; -sl = D; D = (SemiLatLonData *) 0; +sl = D; D = (SemiLatLonData *) nullptr; return; } +//////////////////////////////////////////////////////////////////////// + + +void GridInfo::set(const UnstructuredData & data) + +{ + +clear(); + +/* +us = new UnstructuredData(); +memcpy(D, &data, sizeof(data)); +us->Nface = data.Nface; +us->copy_data(data.pointLonLat); +//us = new UnstructuredData(data); +*/ + +UnstructuredData *D = new UnstructuredData; + +//D->Nface = data.Nface; +D->set_points(data.Nface, data.pointLonLat); +us = D; +D = (UnstructuredData *)nullptr; + +} + + //////////////////////////////////////////////////////////////////////// @@ -797,11 +855,9 @@ Grid & Grid::operator=(const Grid & g) { -if ( this == &g ) return ( * this ); - -assign(g); +if ( this != &g ) assign(g); -return ( * this ); +return *this; } @@ -827,7 +883,7 @@ void Grid::init_from_scratch() { -rep = (GridRep *) 0; +rep = (GridRep *) nullptr; clear(); @@ -841,7 +897,7 @@ void Grid::clear() { -if ( rep ) { delete rep; rep = (GridRep *) 0; } +if ( rep ) { delete rep; rep = (GridRep *) nullptr; } set_swap_to_north(false); return; @@ -966,7 +1022,7 @@ double Grid::calc_area(int x, int y) const if ( !rep ) return ( 0.0 ); -return ( rep->calc_area(x, y) ); +return rep->calc_area(x, y); } @@ -980,7 +1036,7 @@ int Grid::nx() const if ( !rep ) return ( 0 ); -return ( rep->nx() ); +return rep->nx(); } @@ -994,7 +1050,7 @@ int Grid::ny() const if ( !rep ) return ( 0 ); -return ( rep->ny() ); +return rep->ny(); } @@ -1006,7 +1062,7 @@ int Grid::nxy() const { -return ( nx()*ny() ); +return nx()*ny(); } @@ -1018,9 +1074,9 @@ double Grid::scale_km() const { -if ( !rep ) return ( 0 ); +if ( !rep ) return 0; -return ( rep->scale_km() ); +return rep->scale_km(); } @@ -1032,9 +1088,9 @@ ConcatString Grid::name() const { -if ( !rep ) return ( ConcatString("(no name)") ); +if ( !rep ) return ConcatString("(no name)"); -return ( rep->name() ); +return rep->name(); } @@ -1050,7 +1106,7 @@ ConcatString s; if ( rep ) s = rep->serialize(sep); -return ( s ); +return s; } @@ -1071,7 +1127,7 @@ if ( !rep ) { } -return ( rep->info() ); +return rep->info(); } @@ -1093,7 +1149,7 @@ if ( !rep ) { } -return ( rep->rot_grid_to_earth(x, y) ); +return rep->rot_grid_to_earth(x, y); } @@ -1114,7 +1170,7 @@ if ( !rep ) { } -return ( rep->wrap_lon() ); +return rep->wrap_lon(); } @@ -1135,7 +1191,7 @@ if ( !rep ) { } -return ( rep->shift_right(N) ); +return rep->shift_right(N); } @@ -1246,7 +1302,7 @@ if ( info_new.lc ) { } -return ( g_new ); +return g_new; } @@ -1285,7 +1341,7 @@ iy_ll = ll_func(dy_center, ny_new); // subset // -return ( subset_ll(ix_ll, iy_ll, nx_new, ny_new) ); +return subset_ll(ix_ll, iy_ll, nx_new, ny_new); } @@ -1305,10 +1361,10 @@ bool operator==(const Grid & g1, const Grid & g2) { -if ( !(g1.rep) ) return ( false ); -if ( !(g2.rep) ) return ( false ); +if ( !(g1.rep) ) return false; +if ( !(g2.rep) ) return false; -return ( g1.info() == g2.info() ); +return g1.info() == g2.info(); } @@ -1322,7 +1378,7 @@ bool operator!=(const Grid & g1, const Grid & g2) bool status = (g1 == g2); -return ( ! status ); +return ! status; } @@ -1343,8 +1399,9 @@ else if ( i1.g && i2.g ) return ( is_eq(i1.g, i2.g ) ); else if ( i1.gi && i2.gi ) return ( is_eq(i1.gi, i2.gi ) ); else if ( i1.la && i2.la ) return ( is_eq(i1.la, i2.la ) ); else if ( i1.sl && i2.sl ) return ( is_eq(i1.sl, i2.sl ) ); +else if ( i1.us && i2.us ) return ( is_eq(i1.us, i2.us ) ); -return ( false ); +return false; } @@ -1356,7 +1413,7 @@ bool is_eq(const LambertData * lc1, const LambertData * lc2) { -if ( !lc1 || !lc2 ) return ( false ); +if ( !lc1 || !lc2 ) return false; bool status = false; @@ -1375,7 +1432,7 @@ if ( lc1->nx == lc2->nx && is_eq (lc1->r_km, lc2->r_km, loose_tol) && is_eq (lc1->so2_angle, lc2->so2_angle, loose_tol) ) status = true; -return ( status ); +return status; } @@ -1387,7 +1444,7 @@ bool is_eq(const StereographicData * st1, const StereographicData * st2) { -if ( !st1 || !st2 ) return ( false ); +if ( !st1 || !st2 ) return false; bool status = false; @@ -1406,7 +1463,7 @@ if ( st1->nx == st2->nx && is_eq (st1->dy_km, st2->dy_km, loose_tol) && is_eq (st1->r_km, st2->r_km, loose_tol) ) status = true; -return ( status ); +return status; } @@ -1418,7 +1475,7 @@ bool is_eq(const LatLonData * ll1, const LatLonData * ll2) { -if ( !ll1 || !ll2 ) return ( false ); +if ( !ll1 || !ll2 ) return false; bool status = false; @@ -1430,7 +1487,7 @@ if ( ll1->Nlat == ll2->Nlat && is_eq (ll1->delta_lat, ll2->delta_lat, loose_tol) && is_eq (ll1->delta_lon, ll2->delta_lon, loose_tol) ) status = true; -return ( status ); +return status; } @@ -1442,7 +1499,7 @@ bool is_eq(const RotatedLatLonData * ll1, const RotatedLatLonData * ll2) { -if ( !ll1 || !ll2 ) return ( false ); +if ( !ll1 || !ll2 ) return false; bool status = false; @@ -1463,7 +1520,7 @@ if ( ll1->Nlat == ll2->Nlat && is_eq (ll1->aux_rotation, ll2->aux_rotation, loose_tol) ) status = true; -return ( status ); +return status; } @@ -1475,7 +1532,7 @@ bool is_eq(const MercatorData * m1, const MercatorData * m2) { -if ( !m1 || !m2 ) return ( false ); +if ( !m1 || !m2 ) return false; bool status = false; @@ -1488,7 +1545,7 @@ if ( m1->nx == m2->nx && is_eq (rescale_lon(m1->lon_ur), rescale_lon(m2->lon_ur), loose_tol) ) status = true; -return ( status ); +return status; } @@ -1500,7 +1557,7 @@ bool is_eq(const GaussianData * g1, const GaussianData * g2) { -if ( !g1 || !g2 ) return ( false ); +if ( !g1 || !g2 ) return false; bool status = false; @@ -1509,7 +1566,7 @@ if ( is_eq (rescale_lon(g1->lon_zero), g1->nx == g2->nx && g1->ny == g2->ny ) status = true; -return ( status ); +return status; } @@ -1520,7 +1577,7 @@ return ( status ); bool is_eq(const GoesImagerData * gi1, const GoesImagerData * gi2) { -if ( !gi1 || !gi2 ) return ( false ); +if ( !gi1 || !gi2 ) return false; bool status = false; @@ -1541,7 +1598,7 @@ if ( gi1->nx == gi2->nx && is_eq (gi1->dx_rad, gi2->dx_rad, loose_tol) && is_eq (gi1->dy_rad, gi2->dy_rad, loose_tol) ) status = true; -return ( status ); +return status; } @@ -1553,7 +1610,7 @@ bool is_eq(const LaeaData * g1, const LaeaData * g2) { -if ( !g1 || !g2 ) return ( false ); +if ( !g1 || !g2 ) return false; bool status = false; @@ -1572,7 +1629,7 @@ if ( g1->radius_km == g2->radius_km && g1->ny == g2->ny && g1->is_sphere == g2->is_sphere ) status = true; -return ( status ); +return status; } @@ -1584,7 +1641,7 @@ bool is_eq(const SemiLatLonData * gi1, const SemiLatLonData * gi2) { -if ( !gi1 || !gi2 ) return ( false ); +if ( !gi1 || !gi2 ) return false; bool status = false; @@ -1594,7 +1651,35 @@ if ( gi1->lats == gi2->lats && gi1->times == gi2->times ) status = true; -return ( status ); +return status; + +} + + +//////////////////////////////////////////////////////////////////////// + + +bool is_eq(const UnstructuredData * us1, const UnstructuredData * us2) + +{ + +if ( !us1 || !us2 ) return false; + +bool status = false; + + +cout << " CORRECT ME !!! grid_base.cc: is_eq(const UnstructuredData * us1, const UnstructuredData * us2)\n"; + +if ( us1->Nface == us2->Nface && + us1->Nnode == us2->Nnode && + us1->Nedge == us2->Nedge && + us1->pointLonLat[0] == us2->pointLonLat[0] ) { + if (us1->Nface > 0 && us1->pointLonLat[us1->Nface-1] == us2->pointLonLat[us2->Nface-1]) status = true; +} + +cout << " CORRECT ME !!! grid_base.cc: is_eq(const UnstructuredData * us1, const UnstructuredData * us2) status=" << status << "\n"; + +return status; } @@ -1619,7 +1704,7 @@ if ( is_even(N) ) { } -return ( LL ); +return LL; } diff --git a/src/libcode/vx_grid/grid_base.h b/src/libcode/vx_grid/grid_base.h index 81059c0353..6a9047dbe5 100644 --- a/src/libcode/vx_grid/grid_base.h +++ b/src/libcode/vx_grid/grid_base.h @@ -30,6 +30,7 @@ #include "goes_grid_defs.h" #include "laea_grid_defs.h" #include "semilatlon_grid_defs.h" +#include "unstructured_grid_defs.h" //////////////////////////////////////////////////////////////////////// @@ -72,6 +73,7 @@ class GridInfo { void set(const TcrmwData &); void set(const LaeaData &); void set(const SemiLatLonData &); + void set(const UnstructuredData &); void create_grid(Grid &) const; @@ -89,6 +91,7 @@ class GridInfo { const TcrmwData * tc; // allocated const LaeaData * la; // allocated const SemiLatLonData * sl; // allocated + const UnstructuredData * us; // allocated }; @@ -210,6 +213,7 @@ class Grid : public GridInterface { Grid(const LaeaData &); Grid(const LaeaNetcdfData &); Grid(const SemiLatLonData &); + Grid(const UnstructuredData &); virtual ~Grid(); Grid(const Grid &); Grid & operator=(const Grid &); @@ -232,6 +236,7 @@ class Grid : public GridInterface { void set (const LaeaData &); void set (const LaeaNetcdfData &); void set (const SemiLatLonData &); + void set (const UnstructuredData &); void set_swap_to_north(bool swap_to_north); bool get_swap_to_north() const; @@ -274,7 +279,7 @@ class Grid : public GridInterface { //////////////////////////////////////////////////////////////////////// -inline bool Grid::is_set() const { return ( rep != 0 ); } +inline bool Grid::is_set() const { return ( rep != nullptr ); } //////////////////////////////////////////////////////////////////////// @@ -293,6 +298,7 @@ extern bool is_eq(const GaussianData *, const GaussianData *); extern bool is_eq(const GoesImagerData *, const GoesImagerData *); extern bool is_eq(const LaeaData *, const LaeaData *); extern bool is_eq(const SemiLatLonData *, const SemiLatLonData *); +extern bool is_eq(const UnstructuredData *, const UnstructuredData *); //////////////////////////////////////////////////////////////////////// From 70da6bb25af5ee908c644a5b7acf18af02b35993 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 12 Sep 2023 10:44:00 -0600 Subject: [PATCH 010/109] #2231 Added MET_ATLAS, MET_ECKIT and more files --- src/libcode/vx_grid/Makefile.am | 1 + src/libcode/vx_grid/Makefile.in | 30 ++++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/libcode/vx_grid/Makefile.am b/src/libcode/vx_grid/Makefile.am index 1652066e87..e9cd604362 100644 --- a/src/libcode/vx_grid/Makefile.am +++ b/src/libcode/vx_grid/Makefile.am @@ -34,5 +34,6 @@ libvx_grid_a_SOURCES = \ goes_grid.cc goes_grid.h \ semilatlon_grid_defs.h \ semilatlon_grid.cc semilatlon_grid.h \ + unstructured_grid.cc unstructured_grid.h unstructured_grid_defs.h \ vx_grid.h libvx_grid_a_CPPFLAGS = ${MET_CPPFLAGS} diff --git a/src/libcode/vx_grid/Makefile.in b/src/libcode/vx_grid/Makefile.in index a67bd0ec16..3a89452b27 100644 --- a/src/libcode/vx_grid/Makefile.in +++ b/src/libcode/vx_grid/Makefile.in @@ -120,7 +120,8 @@ am_libvx_grid_a_OBJECTS = libvx_grid_a-earth_rotation.$(OBJEXT) \ libvx_grid_a-rot_latlon_grid.$(OBJEXT) \ libvx_grid_a-tcrmw_grid.$(OBJEXT) \ libvx_grid_a-goes_grid.$(OBJEXT) \ - libvx_grid_a-semilatlon_grid.$(OBJEXT) + libvx_grid_a-semilatlon_grid.$(OBJEXT) \ + libvx_grid_a-unstructured_grid.$(OBJEXT) libvx_grid_a_OBJECTS = $(am_libvx_grid_a_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -150,7 +151,8 @@ am__depfiles_remade = ./$(DEPDIR)/libvx_grid_a-earth_rotation.Po \ ./$(DEPDIR)/libvx_grid_a-rot_latlon_grid.Po \ ./$(DEPDIR)/libvx_grid_a-semilatlon_grid.Po \ ./$(DEPDIR)/libvx_grid_a-st_grid.Po \ - ./$(DEPDIR)/libvx_grid_a-tcrmw_grid.Po + ./$(DEPDIR)/libvx_grid_a-tcrmw_grid.Po \ + ./$(DEPDIR)/libvx_grid_a-unstructured_grid.Po am__mv = mv -f AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -253,11 +255,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -384,6 +392,7 @@ libvx_grid_a_SOURCES = \ goes_grid.cc goes_grid.h \ semilatlon_grid_defs.h \ semilatlon_grid.cc semilatlon_grid.h \ + unstructured_grid.cc unstructured_grid.h unstructured_grid_defs.h \ vx_grid.h libvx_grid_a_CPPFLAGS = ${MET_CPPFLAGS} @@ -449,6 +458,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_grid_a-semilatlon_grid.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_grid_a-st_grid.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_grid_a-tcrmw_grid.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_grid_a-unstructured_grid.Po@am__quote@ # am--include-marker $(am__depfiles_remade): @$(MKDIR_P) $(@D) @@ -666,6 +676,20 @@ libvx_grid_a-semilatlon_grid.obj: semilatlon_grid.cc @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_grid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_grid_a-semilatlon_grid.obj `if test -f 'semilatlon_grid.cc'; then $(CYGPATH_W) 'semilatlon_grid.cc'; else $(CYGPATH_W) '$(srcdir)/semilatlon_grid.cc'; fi` +libvx_grid_a-unstructured_grid.o: unstructured_grid.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_grid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_grid_a-unstructured_grid.o -MD -MP -MF $(DEPDIR)/libvx_grid_a-unstructured_grid.Tpo -c -o libvx_grid_a-unstructured_grid.o `test -f 'unstructured_grid.cc' || echo '$(srcdir)/'`unstructured_grid.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_grid_a-unstructured_grid.Tpo $(DEPDIR)/libvx_grid_a-unstructured_grid.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='unstructured_grid.cc' object='libvx_grid_a-unstructured_grid.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_grid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_grid_a-unstructured_grid.o `test -f 'unstructured_grid.cc' || echo '$(srcdir)/'`unstructured_grid.cc + +libvx_grid_a-unstructured_grid.obj: unstructured_grid.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_grid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_grid_a-unstructured_grid.obj -MD -MP -MF $(DEPDIR)/libvx_grid_a-unstructured_grid.Tpo -c -o libvx_grid_a-unstructured_grid.obj `if test -f 'unstructured_grid.cc'; then $(CYGPATH_W) 'unstructured_grid.cc'; else $(CYGPATH_W) '$(srcdir)/unstructured_grid.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_grid_a-unstructured_grid.Tpo $(DEPDIR)/libvx_grid_a-unstructured_grid.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='unstructured_grid.cc' object='libvx_grid_a-unstructured_grid.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_grid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_grid_a-unstructured_grid.obj `if test -f 'unstructured_grid.cc'; then $(CYGPATH_W) 'unstructured_grid.cc'; else $(CYGPATH_W) '$(srcdir)/unstructured_grid.cc'; fi` + ID: $(am__tagged_files) $(am__define_uniq_tagged_files); mkid -fID $$unique tags: tags-am @@ -805,6 +829,7 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/libvx_grid_a-semilatlon_grid.Po -rm -f ./$(DEPDIR)/libvx_grid_a-st_grid.Po -rm -f ./$(DEPDIR)/libvx_grid_a-tcrmw_grid.Po + -rm -f ./$(DEPDIR)/libvx_grid_a-unstructured_grid.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -864,6 +889,7 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libvx_grid_a-semilatlon_grid.Po -rm -f ./$(DEPDIR)/libvx_grid_a-st_grid.Po -rm -f ./$(DEPDIR)/libvx_grid_a-tcrmw_grid.Po + -rm -f ./$(DEPDIR)/libvx_grid_a-unstructured_grid.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic From 9043e9989326e7c16912cf74fb9d48ea7c888ce5 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 12 Sep 2023 12:36:49 -0600 Subject: [PATCH 011/109] #231 Added parse_time_string to support the characrter type date --- src/libcode/vx_nc_util/nc_utils.cc | 65 ++++++++++++++++++++++++++++-- src/libcode/vx_nc_util/nc_utils.h | 2 + 2 files changed, 64 insertions(+), 3 deletions(-) diff --git a/src/libcode/vx_nc_util/nc_utils.cc b/src/libcode/vx_nc_util/nc_utils.cc index 6350b6576a..734f87fe7b 100644 --- a/src/libcode/vx_nc_util/nc_utils.cc +++ b/src/libcode/vx_nc_util/nc_utils.cc @@ -1177,15 +1177,20 @@ double get_nc_time(NcVar * var, const int index) { exit(1); } - start.push_back(index); - count.push_back(1); - int vi; short vs; float vf; ncbyte vb; long long vl; + unixtime ref_ut; + int buf_len = 512; + char *tmp_buf = new char[512]; int dataType = GET_NC_TYPE_ID_P(var); + + start.push_back(index); + count.push_back(1); + tmp_buf[0] = 0; + switch (dataType) { case NC_DOUBLE: var->getVar(start, count, &k); @@ -1202,6 +1207,17 @@ double get_nc_time(NcVar * var, const int index) { var->getVar(start, count, &vb); k = (double)vb; break; + case NC_CHAR: + if (2 == get_dim_count(var)) { + buf_len = get_dim_size(var, 1); + start.push_back(0); + count.push_back(buf_len); + } + for (int i=0; igetVar(start, count, tmp_buf); + parse_time_string(tmp_buf, ref_ut); + k = ref_ut; + break; case NC_INT: var->getVar(start, count, &vi); k = (double)vi; @@ -1224,6 +1240,7 @@ double get_nc_time(NcVar * var, const int index) { << GET_NC_NAME_P(var) << "\".\n\n"; exit(1); } + if (tmp_buf) delete tmp_buf; } return(k); @@ -3577,3 +3594,45 @@ void parse_cf_time_string(const char *str, unixtime &ref_ut, } //////////////////////////////////////////////////////////////////////// + +void parse_time_string(const char *str, unixtime &ut) { + static const char *method_name = "parse_time_string() -> "; + + // Initialize + ut = 0; + + // Check for expected time string format: + // [seconds|minutes|hours|days] since YYYY-MM-DD HH:MM:SS + if(!check_reg_exp(nc_time_unit_ymd_exp, str)) { + mlog << Warning << "\n" << method_name + << "unexpected NetCDF CF convention time unit \"" + << str << "\"\n\n"; + return; + } + else { + // Tokenize the input string + // Parse using spaces or 'T' for timestrings such as: + // 2016-01-28T12:00:00Z + // 1977-08-07 12:00:00Z + StringArray tok; + tok.parse_delim(str, " _T"); + // Parse the reference time + StringArray ymd, hms; + ymd.parse_delim(tok[0], "-"); + if(tok.n_elements() > 1) hms.parse_delim(tok[1], ":"); + else hms.parse_delim("00:00:00", ":"); + ut = mdyhms_to_unix(atoi(ymd[1].c_str()), atoi(ymd[2].c_str()), + atoi(ymd[0].c_str()), atoi(hms[0].c_str()), + hms.n_elements() > 1 ? atoi(hms[1].c_str()) : 0, + hms.n_elements() > 2 ? atoi(hms[2].c_str()) : 0); + } + + mlog << Debug(4) << method_name + << "parsed NetCDF time string \"" << str + << "\" as " << ut << " seconds (" << unix_to_yyyymmdd_hhmmss(ut) + << ").\n"; + + return; +} + +//////////////////////////////////////////////////////////////////////// diff --git a/src/libcode/vx_nc_util/nc_utils.h b/src/libcode/vx_nc_util/nc_utils.h index 2e3380c358..09f1b23050 100644 --- a/src/libcode/vx_nc_util/nc_utils.h +++ b/src/libcode/vx_nc_util/nc_utils.h @@ -146,6 +146,7 @@ static const std::string standard_name_att_name = "standard_name"; static const std::string units_att_name = "units"; static const char nc_time_unit_exp[] = "^[a-z|A-Z]* *since *[0-9]\\{1,4\\}-[0-9]\\{1,2\\}-[0-9]\\{1,2\\}"; +static const char nc_time_unit_ymd_exp[] = "[0-9]\\{1,4\\}-[0-9]\\{1,2\\}-[0-9]\\{1,2\\}"; static const char MET_NC_Obs_ver_1_2[] = "1.02"; static const char MET_NC_Obs_version[] = "1.02"; @@ -385,6 +386,7 @@ extern bool is_nc_unit_latitude(const char *units); extern void parse_cf_time_string(const char *str, unixtime &ref_ut, int &sec_per_unit); +extern void parse_time_string(const char *str, unixtime &ut); //////////////////////////////////////////////////////////////////////// From 6a3710f3f97a7951b7740f5ff26b6502d6f1ce60 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 12 Sep 2023 12:43:30 -0600 Subject: [PATCH 012/109] #2231 Support unstructured grid --- src/tools/core/grid_stat/Makefile.am | 3 +- src/tools/core/grid_stat/Makefile.in | 9 ++++- src/tools/core/grid_stat/grid_stat.cc | 33 ++++++++++++++++--- .../core/grid_stat/grid_stat_conf_info.h | 2 +- src/tools/core/point_stat/Makefile.in | 9 ++++- src/tools/core/point_stat/point_stat.cc | 29 +++++++++++++--- .../core/point_stat/point_stat_conf_info.cc | 5 +-- .../core/point_stat/point_stat_conf_info.h | 8 ++--- 8 files changed, 80 insertions(+), 18 deletions(-) diff --git a/src/tools/core/grid_stat/Makefile.am b/src/tools/core/grid_stat/Makefile.am index 75382103e4..d6bcf022d9 100644 --- a/src/tools/core/grid_stat/Makefile.am +++ b/src/tools/core/grid_stat/Makefile.am @@ -26,9 +26,10 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/core/grid_stat/Makefile.in b/src/tools/core/grid_stat/Makefile.in index 07eed34176..ca963b5493 100644 --- a/src/tools/core/grid_stat/Makefile.in +++ b/src/tools/core/grid_stat/Makefile.in @@ -215,11 +215,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -336,9 +342,10 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/core/grid_stat/grid_stat.cc b/src/tools/core/grid_stat/grid_stat.cc index 6eef678e72..981c56493b 100644 --- a/src/tools/core/grid_stat/grid_stat.cc +++ b/src/tools/core/grid_stat/grid_stat.cc @@ -114,8 +114,6 @@ // //////////////////////////////////////////////////////////////////////// -using namespace std; - #include #include #include @@ -127,8 +125,6 @@ using namespace std; #include #include -using namespace netCDF; - #include "main.h" #include "handle_openmp.h" @@ -140,8 +136,19 @@ using namespace netCDF; #include "vx_log.h" #include "seeps.h" +#include "vx_data2d_ugrid.h" + +using namespace std; +using namespace netCDF; + + //////////////////////////////////////////////////////////////////////// +static ConcatString ugrid_nc; + +//////////////////////////////////////////////////////////////////////// + + static void process_command_line(int, char **); static void setup_first_pass (const DataPlane &); @@ -184,6 +191,7 @@ static void clean_up(); static void usage(); static void set_outdir(const StringArray &); static void set_compress(const StringArray &); +static void set_ugrid_nc(const StringArray &); static bool read_data_plane(VarInfo* info, DataPlane& dp, Met2dDataFile* mtddf, const ConcatString &filename); @@ -236,6 +244,7 @@ void process_command_line(int argc, char **argv) { // Add the options function calls cline.add(set_outdir, "-outdir", 1); cline.add(set_compress, "-compress", 1); + cline.add(set_ugrid_nc, "-ugrid", 1); // Parse the command line cline.parse(); @@ -263,6 +272,7 @@ void process_command_line(int argc, char **argv) { // Get the forecast and observation file types from config, if present ftype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_fcst)); otype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_obs)); + if (ftype == FileType_None && 0 < ugrid_nc.length()) ftype = FileType_UGrid; // Read forecast file if(!(fcst_mtddf = mtddf_factory.new_met_2d_data_file(fcst_file.c_str(), ftype))) { @@ -285,6 +295,10 @@ void process_command_line(int argc, char **argv) { // Process the configuration conf_info.process_config(ftype, otype); + if (FileType_UGrid == ftype) { + ((MetUGridDataFile *)fcst_mtddf)->open_metadata(ugrid_nc.c_str()); + } + // For python types read the first field to set the grid if(is_python_grdfiletype(ftype)) { if(!fcst_mtddf->data_plane(*conf_info.vx_opt[0].fcst_info, dp)) { @@ -3026,6 +3040,7 @@ void usage() { << "\tfcst_file\n" << "\tobs_file\n" << "\tconfig_file\n" + << "\t[-ugrid ugrid_file]\n" << "\t[-outdir path]\n" << "\t[-log file]\n" << "\t[-v level]\n" @@ -3040,6 +3055,9 @@ void usage() { << "\t\t\"config_file\" is a GridStatConfig file containing " << "the desired configuration settings (required).\n" + << "\t\t\"-ugrid ugrid_file\" is the metadata file for unstructured grid " + << " (only required for unstructured grid data).\n" + << "\t\t\"-outdir path\" overrides the default output directory " << "(" << out_dir << ") (optional).\n" @@ -3069,6 +3087,13 @@ void set_compress(const StringArray & a) { //////////////////////////////////////////////////////////////////////// +void set_ugrid_nc(const StringArray & a) +{ + ugrid_nc = a[0]; +} + +//////////////////////////////////////////////////////////////////////// + bool read_data_plane(VarInfo* info, DataPlane& dp, Met2dDataFile* mtddf, const ConcatString &filename) { diff --git a/src/tools/core/grid_stat/grid_stat_conf_info.h b/src/tools/core/grid_stat/grid_stat_conf_info.h index a6bf8dd4e7..f3ebdf5441 100644 --- a/src/tools/core/grid_stat/grid_stat_conf_info.h +++ b/src/tools/core/grid_stat/grid_stat_conf_info.h @@ -277,7 +277,7 @@ class GridStatConfInfo { GridStatVxOpt * vx_opt; // Array of vx task options [n_vx] (allocated) - map mask_map; // Mapping of mask names to MaskPlanes + std::map mask_map; // Mapping of mask names to MaskPlanes GridWeightType grid_weight_flag; // Grid weighting flag ConcatString tmp_dir; // Directory for temporary files diff --git a/src/tools/core/point_stat/Makefile.in b/src/tools/core/point_stat/Makefile.in index 6970bd2117..610f61f98d 100644 --- a/src/tools/core/point_stat/Makefile.in +++ b/src/tools/core/point_stat/Makefile.in @@ -216,11 +216,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -335,10 +341,11 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/core/point_stat/point_stat.cc b/src/tools/core/point_stat/point_stat.cc index 78ed0bd1d0..a12d434218 100644 --- a/src/tools/core/point_stat/point_stat.cc +++ b/src/tools/core/point_stat/point_stat.cc @@ -106,8 +106,6 @@ // //////////////////////////////////////////////////////////////////////// -using namespace std; - #include #include #include @@ -119,7 +117,6 @@ using namespace std; #include #include -using namespace netCDF; #include "main.h" #include "point_stat.h" @@ -133,14 +130,19 @@ using namespace netCDF; #include "nc_obs_util.h" #include "nc_point_obs_in.h" +#include "vx_data2d_ugrid.h" + #ifdef WITH_PYTHON #include "data2d_nc_met.h" #include "pointdata_python.h" #endif -//////////////////////////////////////////////////////////////////////// +using namespace std; +using namespace netCDF; +//////////////////////////////////////////////////////////////////////// +static ConcatString ugrid_nc; //////////////////////////////////////////////////////////////////////// @@ -177,6 +179,7 @@ static void set_ncfile(const StringArray &); static void set_obs_valid_beg_time(const StringArray &); static void set_obs_valid_end_time(const StringArray &); static void set_outdir(const StringArray &); +static void set_ugrid_nc(const StringArray &); //////////////////////////////////////////////////////////////////////// @@ -240,6 +243,7 @@ void process_command_line(int argc, char **argv) { cline.add(set_obs_valid_beg_time, "-obs_valid_beg", 1); cline.add(set_obs_valid_end_time, "-obs_valid_end", 1); cline.add(set_outdir, "-outdir", 1); + cline.add(set_ugrid_nc, "-ugrid", 1); // Parse the command line cline.parse(); @@ -280,6 +284,7 @@ void process_command_line(int argc, char **argv) { // Get the forecast file type from config, if present ftype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_fcst)); + if (ftype == FileType_None && 0 < ugrid_nc.length()) ftype = FileType_UGrid; // Read forecast file if(!(fcst_mtddf = mtddf_factory.new_met_2d_data_file(fcst_file.c_str(), ftype))) { @@ -297,6 +302,10 @@ void process_command_line(int argc, char **argv) { // Set the model name shc.set_model(conf_info.model.c_str()); + if (FileType_UGrid == ftype) { + ((MetUGridDataFile *)fcst_mtddf)->open_metadata(ugrid_nc.c_str()); + } + // Use the first verification task to set the random number generator // and seed value for bootstrap confidence intervals rng_set(rng_ptr, @@ -2164,6 +2173,7 @@ void usage() { << "\t[-point_obs file]\n" << "\t[-obs_valid_beg time]\n" << "\t[-obs_valid_end time]\n" + << "\t[-ugrid ugrid_file]\n" << "\t[-outdir path]\n" << "\t[-log file]\n" << "\t[-v level]\n\n" @@ -2189,6 +2199,9 @@ void usage() { << "\t\t\"-outdir path\" overrides the default output " << "directory (" << out_dir << ") (optional).\n" + << "\t\t\"-ugrid ugrid_file\" is the metadata file for unstructured grid " + << " (only required for unstructured grid data).\n" + << "\t\t\"-log file\" outputs log messages to the specified " << "file (optional).\n" @@ -2234,3 +2247,11 @@ void set_outdir(const StringArray & a) } //////////////////////////////////////////////////////////////////////// + +void set_ugrid_nc(const StringArray & a) +{ + ugrid_nc = a[0]; +} + +//////////////////////////////////////////////////////////////////////// + diff --git a/src/tools/core/point_stat/point_stat_conf_info.cc b/src/tools/core/point_stat/point_stat_conf_info.cc index 47823acdb5..c1f6d35af2 100644 --- a/src/tools/core/point_stat/point_stat_conf_info.cc +++ b/src/tools/core/point_stat/point_stat_conf_info.cc @@ -8,8 +8,6 @@ //////////////////////////////////////////////////////////////////////// -using namespace std; - #include #include #include @@ -23,6 +21,9 @@ using namespace std; #include "vx_data2d.h" #include "vx_log.h" +using namespace std; + + //////////////////////////////////////////////////////////////////////// // // Code for class PointStatConfInfo diff --git a/src/tools/core/point_stat/point_stat_conf_info.h b/src/tools/core/point_stat/point_stat_conf_info.h index 26613f0781..61a5f58ec2 100644 --- a/src/tools/core/point_stat/point_stat_conf_info.h +++ b/src/tools/core/point_stat/point_stat_conf_info.h @@ -134,7 +134,7 @@ class PointStatVxOpt { SingleThresh seeps_p1_thresh; // SEESP p1 threshold // Vector of MaskLatLon objects defining Lat/Lon Point masks - vector mask_llpnt; + std::vector mask_llpnt; StringArray mask_name; // Masking names @@ -235,13 +235,13 @@ class PointStatConfInfo { SingleThresh topo_interp_fcst_thresh; // Message type groups that should be processed together - map msg_typ_group_map; + std::map msg_typ_group_map; // Mapping of mask names to DataPlanes - map mask_area_map; + std::map mask_area_map; // Mapping of mask names to Station ID lists - map mask_sid_map; + std::map mask_sid_map; ConcatString tmp_dir; // Directory for temporary files ConcatString output_prefix; // String to customize output file name From 8fc91402c81f74cfa71ea3bb1784151f84d793b0 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 12 Sep 2023 12:48:58 -0600 Subject: [PATCH 013/109] Initial release --- data/config/UGridConfig_default | 33 + src/libcode/vx_data2d_ugrid/Makefile.am | 20 + src/libcode/vx_data2d_ugrid/Makefile.in | 679 +++++++++++++ src/libcode/vx_data2d_ugrid/data2d_ugrid.cc | 706 ++++++++++++++ src/libcode/vx_data2d_ugrid/data2d_ugrid.h | 125 +++ src/libcode/vx_data2d_ugrid/ugrid_file.cc | 902 ++++++++++++++++++ src/libcode/vx_data2d_ugrid/ugrid_file.h | 172 ++++ src/libcode/vx_data2d_ugrid/var_info_ugrid.cc | 470 +++++++++ src/libcode/vx_data2d_ugrid/var_info_ugrid.h | 101 ++ src/libcode/vx_grid/unstructured_grid.cc | 388 ++++++++ src/libcode/vx_grid/unstructured_grid.h | 97 ++ src/libcode/vx_grid/unstructured_grid_defs.h | 64 ++ 12 files changed, 3757 insertions(+) create mode 100644 data/config/UGridConfig_default create mode 100644 src/libcode/vx_data2d_ugrid/Makefile.am create mode 100644 src/libcode/vx_data2d_ugrid/Makefile.in create mode 100644 src/libcode/vx_data2d_ugrid/data2d_ugrid.cc create mode 100644 src/libcode/vx_data2d_ugrid/data2d_ugrid.h create mode 100644 src/libcode/vx_data2d_ugrid/ugrid_file.cc create mode 100644 src/libcode/vx_data2d_ugrid/ugrid_file.h create mode 100644 src/libcode/vx_data2d_ugrid/var_info_ugrid.cc create mode 100644 src/libcode/vx_data2d_ugrid/var_info_ugrid.h create mode 100644 src/libcode/vx_grid/unstructured_grid.cc create mode 100644 src/libcode/vx_grid/unstructured_grid.h create mode 100644 src/libcode/vx_grid/unstructured_grid_defs.h diff --git a/data/config/UGridConfig_default b/data/config/UGridConfig_default new file mode 100644 index 0000000000..0fd8b355c7 --- /dev/null +++ b/data/config/UGridConfig_default @@ -0,0 +1,33 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Unstructured Grid configuration file. +// +// For additional information, please see the MET User's Guide. +// +//////////////////////////////////////////////////////////////////////////////// + +// +// Default mapping for Metadata. +// +metadata_map = [ + { key = "dim_face"; val = "nCells,nMesh2d_face"; }, + { key = "dim_node"; val = "nVertices,nMesh2d_node"; }, + { key = "dim_edge"; val = "nEdges,nMesh2d_edge"; }, + { key = "dim_time"; val = "Time,time_counter"; }, + { key = "dim_vert"; val = "nVertLevels"; }, + { key = "cell_id"; val = "indexToCellID,"; }, + { key = "lat_face"; val = "latCell,Mesh2d_face_y"; }, + { key = "lon_face"; val = "lonCell,Mesh2d_face_x"; }, + { key = "vert_face"; val = "zCell"; }, + { key = "lat_edge"; val = "latEdge,Mesh2d_edge_y"; }, + { key = "lon_edge"; val = "lonEdge,Mesh2d_edge_x"; }, + { key = "lat_node"; val = "latVertex,Mesh2d_node_y"; }, + { key = "lon_node"; val = "lonVertex,Mesh2d_node_x"; }, + { key = "time"; val = "xtime,time_centered"; } +]; + +//////////////////////////////////////////////////////////////////////////////// + +version = "V12.0.0"; + +//////////////////////////////////////////////////////////////////////////////// diff --git a/src/libcode/vx_data2d_ugrid/Makefile.am b/src/libcode/vx_data2d_ugrid/Makefile.am new file mode 100644 index 0000000000..98c2814a20 --- /dev/null +++ b/src/libcode/vx_data2d_ugrid/Makefile.am @@ -0,0 +1,20 @@ +## @start 1 +## Makefile.am -- Process this file with automake to produce Makefile.in +## @end 1 + +MAINTAINERCLEANFILES = Makefile.in + +# Include the project definitions + +include ${top_srcdir}/Make-include + +# The library + +noinst_LIBRARIES = libvx_data2d_ugrid.a +libvx_data2d_ugrid_a_SOURCES = \ + ugrid_file.cc ugrid_file.h \ + var_info_ugrid.cc var_info_ugrid.h \ + data2d_ugrid.cc data2d_ugrid.h \ + vx_data2d_ugrid.h +libvx_data2d_ugrid_a_CPPFLAGS = ${MET_CPPFLAGS} + diff --git a/src/libcode/vx_data2d_ugrid/Makefile.in b/src/libcode/vx_data2d_ugrid/Makefile.in new file mode 100644 index 0000000000..4a5123003e --- /dev/null +++ b/src/libcode/vx_data2d_ugrid/Makefile.in @@ -0,0 +1,679 @@ +# Makefile.in generated by automake 1.16.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2018 Free Software Foundation, Inc. + +# This Makefile.in 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = src/libcode/vx_data2d_ugrid +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +LIBRARIES = $(noinst_LIBRARIES) +AR = ar +ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = +libvx_data2d_ugrid_a_AR = $(AR) $(ARFLAGS) +libvx_data2d_ugrid_a_LIBADD = +am_libvx_data2d_ugrid_a_OBJECTS = \ + libvx_data2d_ugrid_a-ugrid_file.$(OBJEXT) \ + libvx_data2d_ugrid_a-var_info_ugrid.$(OBJEXT) \ + libvx_data2d_ugrid_a-data2d_ugrid.$(OBJEXT) +libvx_data2d_ugrid_a_OBJECTS = $(am_libvx_data2d_ugrid_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = \ + ./$(DEPDIR)/libvx_data2d_ugrid_a-data2d_ugrid.Po \ + ./$(DEPDIR)/libvx_data2d_ugrid_a-ugrid_file.Po \ + ./$(DEPDIR)/libvx_data2d_ugrid_a-var_info_ugrid.Po +am__mv = mv -f +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +AM_V_CXX = $(am__v_CXX_@AM_V@) +am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) +am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_1 = +CXXLD = $(CXX) +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ + -o $@ +AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) +am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) +am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_1 = +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libvx_data2d_ugrid_a_SOURCES) +DIST_SOURCES = $(libvx_data2d_ugrid_a_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUFRLIB_NAME = @BUFRLIB_NAME@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FC_LIBS = @FC_LIBS@ +FFLAGS = @FFLAGS@ +FLIBS = @FLIBS@ +GREP = @GREP@ +GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ +GRIB2_LIBS = @GRIB2_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MET_BUFR = @MET_BUFR@ +MET_BUFRLIB = @MET_BUFRLIB@ +MET_CAIRO = @MET_CAIRO@ +MET_CAIROINC = @MET_CAIROINC@ +MET_CAIROLIB = @MET_CAIROLIB@ +MET_FREETYPE = @MET_FREETYPE@ +MET_FREETYPEINC = @MET_FREETYPEINC@ +MET_FREETYPELIB = @MET_FREETYPELIB@ +MET_GRIB2C = @MET_GRIB2C@ +MET_GRIB2CINC = @MET_GRIB2CINC@ +MET_GRIB2CLIB = @MET_GRIB2CLIB@ +MET_GSL = @MET_GSL@ +MET_GSLINC = @MET_GSLINC@ +MET_GSLLIB = @MET_GSLLIB@ +MET_HDF = @MET_HDF@ +MET_HDF5 = @MET_HDF5@ +MET_HDF5INC = @MET_HDF5INC@ +MET_HDF5LIB = @MET_HDF5LIB@ +MET_HDFEOS = @MET_HDFEOS@ +MET_HDFEOSINC = @MET_HDFEOSINC@ +MET_HDFEOSLIB = @MET_HDFEOSLIB@ +MET_HDFINC = @MET_HDFINC@ +MET_HDFLIB = @MET_HDFLIB@ +MET_NETCDF = @MET_NETCDF@ +MET_NETCDFINC = @MET_NETCDFINC@ +MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ +MET_PYTHON_CC = @MET_PYTHON_CC@ +MET_PYTHON_LD = @MET_PYTHON_LD@ +MKDIR_P = @MKDIR_P@ +OBJEXT = @OBJEXT@ +OPENMP_CFLAGS = @OPENMP_CFLAGS@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PYTHON_LIBS = @PYTHON_LIBS@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ +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_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +runstatedir = @runstatedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +MAINTAINERCLEANFILES = Makefile.in + +# The library +noinst_LIBRARIES = libvx_data2d_ugrid.a +libvx_data2d_ugrid_a_SOURCES = \ + ugrid_file.cc ugrid_file.h \ + var_info_ugrid.cc var_info_ugrid.h \ + data2d_ugrid.cc data2d_ugrid.h \ + vx_data2d_ugrid.h + +libvx_data2d_ugrid_a_CPPFLAGS = ${MET_CPPFLAGS} -I/d1/personal/hsoh/third_party/install/atlas/include -I/d1/personal/hsoh/third_party/install/eckit/include +all: all-am + +.SUFFIXES: +.SUFFIXES: .cc .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libcode/vx_data2d_ugrid/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign src/libcode/vx_data2d_ugrid/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +libvx_data2d_ugrid.a: $(libvx_data2d_ugrid_a_OBJECTS) $(libvx_data2d_ugrid_a_DEPENDENCIES) $(EXTRA_libvx_data2d_ugrid_a_DEPENDENCIES) + $(AM_V_at)-rm -f libvx_data2d_ugrid.a + $(AM_V_AR)$(libvx_data2d_ugrid_a_AR) libvx_data2d_ugrid.a $(libvx_data2d_ugrid_a_OBJECTS) $(libvx_data2d_ugrid_a_LIBADD) + $(AM_V_at)$(RANLIB) libvx_data2d_ugrid.a + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_data2d_ugrid_a-data2d_ugrid.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_data2d_ugrid_a-ugrid_file.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_data2d_ugrid_a-var_info_ugrid.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) + +.cc.o: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +libvx_data2d_ugrid_a-ugrid_file.o: ugrid_file.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_data2d_ugrid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_data2d_ugrid_a-ugrid_file.o -MD -MP -MF $(DEPDIR)/libvx_data2d_ugrid_a-ugrid_file.Tpo -c -o libvx_data2d_ugrid_a-ugrid_file.o `test -f 'ugrid_file.cc' || echo '$(srcdir)/'`ugrid_file.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_data2d_ugrid_a-ugrid_file.Tpo $(DEPDIR)/libvx_data2d_ugrid_a-ugrid_file.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ugrid_file.cc' object='libvx_data2d_ugrid_a-ugrid_file.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_data2d_ugrid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_data2d_ugrid_a-ugrid_file.o `test -f 'ugrid_file.cc' || echo '$(srcdir)/'`ugrid_file.cc + +libvx_data2d_ugrid_a-ugrid_file.obj: ugrid_file.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_data2d_ugrid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_data2d_ugrid_a-ugrid_file.obj -MD -MP -MF $(DEPDIR)/libvx_data2d_ugrid_a-ugrid_file.Tpo -c -o libvx_data2d_ugrid_a-ugrid_file.obj `if test -f 'ugrid_file.cc'; then $(CYGPATH_W) 'ugrid_file.cc'; else $(CYGPATH_W) '$(srcdir)/ugrid_file.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_data2d_ugrid_a-ugrid_file.Tpo $(DEPDIR)/libvx_data2d_ugrid_a-ugrid_file.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='ugrid_file.cc' object='libvx_data2d_ugrid_a-ugrid_file.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_data2d_ugrid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_data2d_ugrid_a-ugrid_file.obj `if test -f 'ugrid_file.cc'; then $(CYGPATH_W) 'ugrid_file.cc'; else $(CYGPATH_W) '$(srcdir)/ugrid_file.cc'; fi` + +libvx_data2d_ugrid_a-var_info_ugrid.o: var_info_ugrid.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_data2d_ugrid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_data2d_ugrid_a-var_info_ugrid.o -MD -MP -MF $(DEPDIR)/libvx_data2d_ugrid_a-var_info_ugrid.Tpo -c -o libvx_data2d_ugrid_a-var_info_ugrid.o `test -f 'var_info_ugrid.cc' || echo '$(srcdir)/'`var_info_ugrid.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_data2d_ugrid_a-var_info_ugrid.Tpo $(DEPDIR)/libvx_data2d_ugrid_a-var_info_ugrid.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='var_info_ugrid.cc' object='libvx_data2d_ugrid_a-var_info_ugrid.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_data2d_ugrid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_data2d_ugrid_a-var_info_ugrid.o `test -f 'var_info_ugrid.cc' || echo '$(srcdir)/'`var_info_ugrid.cc + +libvx_data2d_ugrid_a-var_info_ugrid.obj: var_info_ugrid.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_data2d_ugrid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_data2d_ugrid_a-var_info_ugrid.obj -MD -MP -MF $(DEPDIR)/libvx_data2d_ugrid_a-var_info_ugrid.Tpo -c -o libvx_data2d_ugrid_a-var_info_ugrid.obj `if test -f 'var_info_ugrid.cc'; then $(CYGPATH_W) 'var_info_ugrid.cc'; else $(CYGPATH_W) '$(srcdir)/var_info_ugrid.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_data2d_ugrid_a-var_info_ugrid.Tpo $(DEPDIR)/libvx_data2d_ugrid_a-var_info_ugrid.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='var_info_ugrid.cc' object='libvx_data2d_ugrid_a-var_info_ugrid.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_data2d_ugrid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_data2d_ugrid_a-var_info_ugrid.obj `if test -f 'var_info_ugrid.cc'; then $(CYGPATH_W) 'var_info_ugrid.cc'; else $(CYGPATH_W) '$(srcdir)/var_info_ugrid.cc'; fi` + +libvx_data2d_ugrid_a-data2d_ugrid.o: data2d_ugrid.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_data2d_ugrid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_data2d_ugrid_a-data2d_ugrid.o -MD -MP -MF $(DEPDIR)/libvx_data2d_ugrid_a-data2d_ugrid.Tpo -c -o libvx_data2d_ugrid_a-data2d_ugrid.o `test -f 'data2d_ugrid.cc' || echo '$(srcdir)/'`data2d_ugrid.cc +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_data2d_ugrid_a-data2d_ugrid.Tpo $(DEPDIR)/libvx_data2d_ugrid_a-data2d_ugrid.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='data2d_ugrid.cc' object='libvx_data2d_ugrid_a-data2d_ugrid.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_data2d_ugrid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_data2d_ugrid_a-data2d_ugrid.o `test -f 'data2d_ugrid.cc' || echo '$(srcdir)/'`data2d_ugrid.cc + +libvx_data2d_ugrid_a-data2d_ugrid.obj: data2d_ugrid.cc +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_data2d_ugrid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libvx_data2d_ugrid_a-data2d_ugrid.obj -MD -MP -MF $(DEPDIR)/libvx_data2d_ugrid_a-data2d_ugrid.Tpo -c -o libvx_data2d_ugrid_a-data2d_ugrid.obj `if test -f 'data2d_ugrid.cc'; then $(CYGPATH_W) 'data2d_ugrid.cc'; else $(CYGPATH_W) '$(srcdir)/data2d_ugrid.cc'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvx_data2d_ugrid_a-data2d_ugrid.Tpo $(DEPDIR)/libvx_data2d_ugrid_a-data2d_ugrid.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='data2d_ugrid.cc' object='libvx_data2d_ugrid_a-data2d_ugrid.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libvx_data2d_ugrid_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libvx_data2d_ugrid_a-data2d_ugrid.obj `if test -f 'data2d_ugrid.cc'; then $(CYGPATH_W) 'data2d_ugrid.cc'; else $(CYGPATH_W) '$(srcdir)/data2d_ugrid.cc'; fi` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LIBRARIES) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-am + +clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am + +distclean: distclean-am + -rm -f ./$(DEPDIR)/libvx_data2d_ugrid_a-data2d_ugrid.Po + -rm -f ./$(DEPDIR)/libvx_data2d_ugrid_a-ugrid_file.Po + -rm -f ./$(DEPDIR)/libvx_data2d_ugrid_a-var_info_ugrid.Po + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f ./$(DEPDIR)/libvx_data2d_ugrid_a-data2d_ugrid.Po + -rm -f ./$(DEPDIR)/libvx_data2d_ugrid_a-ugrid_file.Po + -rm -f ./$(DEPDIR)/libvx_data2d_ugrid_a-var_info_ugrid.Po + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-noinstLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir 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 \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile + + +# Include the project definitions + +include ${top_srcdir}/Make-include + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc new file mode 100644 index 0000000000..3a1582d0e6 --- /dev/null +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc @@ -0,0 +1,706 @@ +// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* +// ** Copyright UCAR (c) 1992 - 2023 +// ** University Corporation for Atmospheric Research (UCAR) +// ** National Center for Atmospheric Research (NCAR) +// ** Research Applications Lab (RAL) +// ** P.O.Box 3000, Boulder, Colorado, 80307-3000, USA +// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* + + +//////////////////////////////////////////////////////////////////////// + + +#include +#include +#include +#include + +#include + +#include "data2d_ugrid.h" +#include "vx_math.h" +#include "vx_log.h" + +using namespace std; +using namespace netCDF; + +//////////////////////////////////////////////////////////////////////// + +static const int error_code_no_error = 0; +static const int error_code_no_time_dim = 1; +static const int error_code_missing_time_value = 2; +static const int error_code_missing_time_values = 3; +static const int error_code_missing_time_offsets = 4; +static const int error_code_empty_times = 5; +static const int error_code_bad_increment = 6; +static const int error_code_bad_offset = 7; +static const int error_code_unknown = 999; + +//////////////////////////////////////////////////////////////////////// +// +// Code for class MetUGridDataFile +// +//////////////////////////////////////////////////////////////////////// + +MetUGridDataFile::MetUGridDataFile() { + + ugrid_init_from_scratch(); + +} + +//////////////////////////////////////////////////////////////////////// + +MetUGridDataFile::~MetUGridDataFile() { + + close(); +} + +//////////////////////////////////////////////////////////////////////// + +MetUGridDataFile::MetUGridDataFile(const MetUGridDataFile &) { + + mlog << Error << "\nMetUGridDataFile::MetUGridDataFile(const MetUGridDataFile &) -> " + << "should never be called!\n\n"; + exit(1); +} + +//////////////////////////////////////////////////////////////////////// + +MetUGridDataFile & MetUGridDataFile::operator=(const MetUGridDataFile &) { + + mlog << Error << "\nMetUGridDataFile::operator=(const MetUGridDataFile &) -> " + << "should never be called!\n\n"; + exit(1); +} + +//////////////////////////////////////////////////////////////////////// + +void MetUGridDataFile::ugrid_init_from_scratch() { + + _file = (UGridFile *) nullptr; + _cur_time_index = -1; + + close(); + + return; +} + +//////////////////////////////////////////////////////////////////////// +/* +NcVarInfo *MetUGridDataFile::find_first_data_var() { + NcVarInfo *first_data_var = nullptr; + // Store the name of the first data variable + for (int i = 0; i < _file->Nvars; ++i) { + if (is_nc_unit_time(_file->Var[i].units_att.c_str()) || + is_nc_unit_longitude(_file->Var[i].units_att.c_str()) || + is_nc_unit_latitude(_file->Var[i].units_att.c_str()) || + _file->get_time_var_info() == &_file->Var[i] + ) continue; + + if (strcmp(_file->Var[i].name.c_str(), ugrid_lat_var_name) != 0 && + strcmp(_file->Var[i].name.c_str(), ugrid_lon_var_name) != 0) { + first_data_var = &(_file->Var[i]); + break; + } + } + return first_data_var; +} +*/ +//////////////////////////////////////////////////////////////////////// + +void MetUGridDataFile::close() { + + if(_file) { delete _file; _file = (UGridFile *) nullptr; } + + return; +} + +//////////////////////////////////////////////////////////////////////// + +bool MetUGridDataFile::open(const char * _filename) { + + close(); + + _file = new UGridFile; + + if(!_file->open(_filename)) { + mlog << Error << "\nMetUGridDataFile::open(const char *) -> " + << "unable to open NetCDF file \"" << _filename << "\"\n\n"; + close(); + + return false; + } + + Filename = _filename; + + return true; +} + +//////////////////////////////////////////////////////////////////////// + +bool MetUGridDataFile::open_metadata(const char * _filename) { + const char *method_name = "MetUGridDataFile::open_metadata(const char *) -> "; + + if (! _file) { + mlog << Error << "\n" << method_name + << "UGridFile is not initiated to handle \"" << _filename << "\"\n\n"; + close(); + return false; + } + + if (!_file->open_metadata(_filename)) { + mlog << Error << "\n" << method_name + << "unable to open NetCDF file \"" << _filename << "\"\n\n"; + close(); + return false ; + } + + meta_filename = _filename; + + Raw_Grid = new Grid; + + (*Raw_Grid) = _file->grid; + //Raw_Grid->set(*_file->grid.info().us); + + Dest_Grid = new Grid; + + (*Dest_Grid) = (*Raw_Grid); + //Dest_Grid->set(*_file->grid.info().us); + + return(true); +} + +//////////////////////////////////////////////////////////////////////// + +void MetUGridDataFile::dump(ostream & out, int depth) const { + + if(_file) _file->dump(out, depth); + + return; +} + +//////////////////////////////////////////////////////////////////////// + +bool MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane) +{ + // Not sure why we do this + + NcVarInfo *data_var = (NcVarInfo *)nullptr; + VarInfoUGrid *vinfo_nc = (VarInfoUGrid *)&vinfo; + static const string method_name + = "MetUGridDataFile::data_plane(VarInfo &, DataPlane &) -> "; + + // Initialize the data plane + + plane.clear(); + + // Check for NA in the requested name + if ( vinfo_nc->req_name() == na_str ) + { + // Store the name of the first data variable +cout << " FIXME MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane) calling find_first_data_var()\n"; +// data_var = find_first_data_var(); +// if (nullptr != data_var) vinfo_nc->set_req_name(data_var->name.c_str()); + } + + int zdim_slot = bad_data_int; + int time_dim_slot = bad_data_int; + long org_time_offset = bad_data_int; + long org_z_offset = bad_data_int; + NumArray dim_value = vinfo_nc->dim_value(); + LongArray dimension = vinfo_nc->dimension(); + BoolArray is_offset = vinfo_nc->is_offset(); + + data_var = _file->find_var_name(vinfo_nc->req_name().c_str()); +/* + if (nullptr != data_var) { + time_dim_slot = data_var->t_slot; + for (int idx=0; idxValidTime.n(); + long time_threshold_cnt = 10000000; + org_time_offset = dim_offset; + long time_offset = org_time_offset; + if (time_offset == range_flag) time_offset = _cur_time_index; // from data_plane_array() + else if (!is_offset[idx]) { + long time_value = dim_value[idx]; + time_offset = convert_time_to_offset(time_value); + if ((0 > time_offset) || (time_offset >= time_cnt)) { + if (time_value > time_threshold_cnt) // from time string (yyyymmdd_hh) + mlog << Warning << "\n" << method_name << "the requested time " + << unix_to_yyyymmdd_hhmmss(time_value) << " for \"" + << vinfo.req_name() << "\" variable does not exist (" + << unix_to_yyyymmdd_hhmmss(_file->ValidTime[0]) << " and " + << unix_to_yyyymmdd_hhmmss(_file->ValidTime[time_cnt-1]) << ").\n\n"; + else + mlog << Warning << "\n" << method_name << "the requested time value " + << time_value << " for \"" << vinfo.req_name() << "\" variable " + << "is out of range (between 0 and " << (time_cnt-1) << ").\n\n"; + + return false; + } + } + else if ((0 > time_offset) || (time_offset >= time_cnt)) { + time_offset = convert_time_to_offset(time_offset); + } + if ((0 > time_offset) || (time_offset >= time_cnt)) { + mlog << Error << "\n" << method_name << "the requested time offset " + << time_offset << " for \"" << vinfo.req_name() << "\" variable " + << "is out of range (between 0 and " << (time_cnt-1) << ").\n\n"; + return false; + } + dimension[time_dim_slot] = time_offset; + } + else { + long z_cnt = (long)_file->vlevels.n(); + if (z_cnt > 0) { + + zdim_slot = idx; + org_z_offset = dim_offset; + long z_offset = dim_offset; + string z_dim_name; + if (0 <= data_var->z_slot) { + NcDim z_dim = get_nc_dim(data_var->var, data_var->z_slot); + if (IS_VALID_NC(z_dim)) z_dim_name = GET_NC_NAME(z_dim); + } + if (!is_offset[idx]) { + // convert the value to index for slicing + z_offset = convert_value_to_offset(dim_value[idx], z_dim_name); + } + if ((z_offset >= 0) && (z_offset < z_cnt)) + dimension[idx] = long(z_offset); + else { + if (is_offset[idx]) + mlog << Error << "\n" << method_name << "the requested vertical offset " + << dim_offset << " for \"" << vinfo.req_name() << "\" variable " + << "is out of range (between 0 and " << (z_cnt-1) << ").\n\n"; + else + mlog << Error << "\n" << method_name << "the requested vertical value " + << dim_value[idx] << " for \"" << vinfo.req_name() << "\" variable " + << "does not exist (data size = " << z_cnt << ").\n\n"; + return false; + } + } + } + } + } +*/ + + // Read the data + NcVarInfo *info = (NcVarInfo *) 0; + + bool status = _file->getData(vinfo_nc->req_name().c_str(), + dimension, + plane, info); + + if (org_time_offset != bad_data_int && 0 <= time_dim_slot) + dimension[time_dim_slot] = org_time_offset; + if (org_z_offset != bad_data_int && 0 <= zdim_slot) + dimension[zdim_slot] = org_z_offset; + + // Check that the times match those requested + + if (status) + { + // Check that the valid time matches the request + + if (vinfo.valid() > 0 && vinfo.valid() != plane.valid()) + { + // Compute time strings + + ConcatString req_time_str = unix_to_yyyymmdd_hhmmss(vinfo.valid()); + ConcatString data_time_str = unix_to_yyyymmdd_hhmmss(plane.valid()); + + mlog << Warning << "\n" << method_name + << "for \"" << vinfo.req_name() << "\" variable, the valid " + << "time does not match the requested valid time: (" + << data_time_str << " != " << req_time_str << ")\n\n"; + status = false; + } + + // Check that the lead time matches the request + + if (vinfo.lead() > 0 && vinfo.lead() != plane.lead()) + { + // Compute time strings + + ConcatString req_time_str = sec_to_hhmmss(vinfo.lead()); + ConcatString data_time_str = sec_to_hhmmss(plane.lead()); + + mlog << Warning << "\n" << method_name + << "for \"" << vinfo.req_name() << "\" variable, the lead " + << "time does not match the requested lead time: (" + << data_time_str << " != " << req_time_str << ")\n\n"; + status = false; + } + + status = process_data_plane(&vinfo, plane); + + // Set the VarInfo object's name, long_name, level, and units strings + + if (info->name_att.length() > 0) + vinfo.set_name(info->name_att); + else + vinfo.set_name(info->name); + + if (info->long_name_att.length() > 0) + vinfo.set_long_name(info->long_name_att.c_str()); + + if (info->level_att.length() > 0) + vinfo.set_level_name(info->level_att.c_str()); + + if (info->units_att.length() > 0) + vinfo.set_units(info->units_att.c_str()); + } + + return status; +} + +//////////////////////////////////////////////////////////////////////// + +int MetUGridDataFile::data_plane_array(VarInfo &vinfo, + DataPlaneArray &plane_array) { + int n_rec = 0; + DataPlane plane; + bool status = false; + static const string method_name + = "MetUGridDataFile::data_plane_array(VarInfo &, DataPlaneArray &) -> "; + + // Initialize + plane_array.clear(); + + VarInfoUGrid *vinfo_nc = (VarInfoUGrid *)&vinfo; + if ( vinfo_nc->req_name() == na_str ) { + // Store the name of the first data variable +cout << " FIXME MetUGridDataFile::data_plane_array() calling find_first_data_var()\n"; +// NcVarInfo *data_var = find_first_data_var(); +// if (nullptr != data_var) vinfo_nc->set_req_name(data_var->name.c_str()); + } + + LongArray time_offsets = collect_time_offsets(vinfo); + if (0 < time_offsets.n_elements()) { + LevelInfo level = vinfo.level(); + long time_lower = bad_data_int; + long time_upper = bad_data_int; + if (level.type() == LevelType_Time) { + time_lower = level.lower(); + time_upper = level.upper(); + } + + for (int idx=0; idx= debug_level) { + for (int idx=0; idx< time_offsets.n_elements(); idx++ ) { + mlog << Debug(debug_level) << method_name << "time: " + << unix_to_yyyymmdd_hhmmss(_file->ValidTime[time_offsets[idx]]) + << " from index " << time_offsets[idx] << "\n"; + } + } + } + + return(n_rec); +} + +//////////////////////////////////////////////////////////////////////// + +LongArray MetUGridDataFile::collect_time_offsets(VarInfo &vinfo) { + int n_rec = 0; + bool status = false; + VarInfoUGrid *vinfo_nc = (VarInfoUGrid *)&vinfo; + static const string method_name + = "MetUGridDataFile::collect_time_offsets(VarInfo &) -> "; + + LongArray time_offsets; + NcVarInfo *info = _file->find_var_name(vinfo_nc->req_name().c_str()); + + // Check for variable not found + if(!info) { + mlog << Warning << "\n" << method_name + << "can't find NetCDF variable \"" << vinfo_nc->req_name() + << "\" in file \"" << Filename << "\".\n\n"; + return(time_offsets); + } + + int time_dim_slot = info->t_slot; + int time_dim_size = _file->ValidTime.n_elements(); + if (0 < time_dim_size && time_dim_slot < 0) { + // The time dimension does not exist at the variable and the time + // variable exists. Stop time slicing and set the time offset to 0. + time_offsets.add(0); + return(time_offsets); + } + + double time_lower = bad_data_double; + double time_upper = bad_data_double; + int error_code = error_code_no_error; + LevelInfo level = vinfo.level(); + LongArray dimension = vinfo_nc->dimension(); + bool is_time_range = (level.type() == LevelType_Time); + bool time_as_value = !level.is_offset(); + + long dim_offset = (time_dim_slot >= 0) ? dimension[time_dim_slot] : -1; + bool include_all_times = (dim_offset == vx_data2d_star); + + int idx; + TimeArray missing_times; + if (include_all_times) { + for (idx=0; idxValidTime[idx] < time_lower) continue; + next_offset = idx; + if (_file->ValidTime[idx] != time_lower) + missing_times.add(time_lower); + else { + mlog << Debug(9) << method_name << " found the lower time " + << unix_to_yyyymmdd_hhmmss(time_lower) << "\n"; + time_offsets.add(idx); + next_offset++; + } + break; + } + + if (0 > next_offset) error_code = error_code_missing_time_values; + else if (0 > time_inc) error_code = error_code_bad_increment; + else if (0 == time_inc) { // no increment configuration + for (idx=next_offset; idxValidTime[idx] > time_upper) break; + time_offsets.add(idx); + mlog << Debug(9) << method_name << " found the time " + << unix_to_yyyymmdd_hhmmss(_file->ValidTime[idx]) << "\n"; + } + } + else { + long next_time; + next_time = time_lower + time_inc; + for (idx=next_offset; idxValidTime[idx] > time_upper) break; + else if (_file->ValidTime[idx] < next_time) continue; + else if (_file->ValidTime[idx] == next_time) { + time_offsets.add(idx); + mlog << Debug(9) << method_name << " found the time " + << unix_to_yyyymmdd_hhmmss(_file->ValidTime[idx]) << "\n"; + next_time += time_inc; + } + else { // next_time < _file->ValidTime[idx] + while (next_time < _file->ValidTime[idx]) { + missing_times.add(next_time); + next_time += time_inc; + } + if (_file->ValidTime[idx] == next_time) { + time_offsets.add(idx); + mlog << Debug(9) << method_name << " found the time " + << unix_to_yyyymmdd_hhmmss(_file->ValidTime[idx]) << "\n"; + next_time += time_inc; + } + } + if (next_time > time_upper) break; + } + } + } + else if (time_lower < time_dim_size) { + int inc_offset = (time_inc <= 0) ? 1 : time_inc; + int max_time_offset = time_upper; + if (max_time_offset == time_dim_size) + missing_times.add(time_dim_size); + else if (max_time_offset > time_dim_size) { + for (idx=time_dim_size; idx<=max_time_offset; idx++) + missing_times.add(idx); + } + for (idx=time_lower; idxValidTime[0]) << " and " + << unix_to_yyyymmdd_hhmmss(_file->ValidTime[time_dim_size-1]) << "\n"; + else { + mlog << Warning << method_name << "Not found time out of " + << time_dim_size << ".\n"; + if (include_all_times) error_code = error_code_empty_times; + else if (is_time_range) { + error_code = time_as_value ? error_code_missing_time_values + : error_code_missing_time_offsets; + } + } + + // Handling error code + if (error_code > error_code_no_error) { + ConcatString log_msg; + log_msg << "variable \"" << vinfo_nc->req_name() << "\" "; + if (error_code == error_code_no_time_dim) { + log_msg << "does not support the range of times because the time dimension is " + << time_dim_size; + } + else if (error_code == error_code_missing_time_values) { + log_msg << "does not have the matching time ranges between " + << unix_to_yyyymmdd_hhmmss(time_lower) << " and " + << unix_to_yyyymmdd_hhmmss(time_upper); + if (0 < time_dim_size) { + log_msg << " from [" + << unix_to_yyyymmdd_hhmmss(_file->ValidTime.min()) << " and " + << unix_to_yyyymmdd_hhmmss(_file->ValidTime.max()) << "]"; + } + } + else if (error_code == error_code_missing_time_offsets) { + log_msg << "does not have the matching time offsets between " + << nint(time_lower) << " and " << nint(time_upper); + if (0 < time_dim_size) { + log_msg << " [0 <= offset < " << time_dim_size << "]"; + } + } + else if (error_code == error_code_empty_times) { + log_msg << "does not have the time values"; + } + else if (error_code == error_code_bad_increment) { + log_msg << "was configured with bad increment"; + } + else if (error_code == error_code_bad_offset) { + log_msg << "was configured with the bad time offset" + << " (0 <= offset < " << time_dim_size << ")"; + } + else if (error_code == error_code_missing_time_value) { + long time_value = (time_as_value ? dim_offset : -1); + log_msg << "does not have the matching time " + << unix_to_yyyymmdd_hhmmss(time_value) << " [" + << unix_to_yyyymmdd_hhmmss(_file->ValidTime.min()) << " and " + << unix_to_yyyymmdd_hhmmss(_file->ValidTime.max()) << "]"; + } + else { + log_msg.clear(); + log_msg << "variable \"" << vinfo_nc->req_name() + << "\" has unknown error (" << error_code << ")"; + } + mlog << Error << "\n" << method_name << log_msg << ".\n\n"; + exit(1); + } + + return(time_offsets); +} + + +//////////////////////////////////////////////////////////////////////// + +int MetUGridDataFile::index(VarInfo &vinfo){ + + if( nullptr == _file->find_var_name( vinfo.name().c_str() ) ) return -1; + + if( ( vinfo.valid() != 0 && _file->ValidTime[0] != vinfo.valid() ) || + ( vinfo.init() != 0 && _file->InitTime != vinfo.init() ) || + ( !is_bad_data(vinfo.lead()) && _file->lead_time() != vinfo.lead() ) ) + return -1; + + return 0; +} + +//////////////////////////////////////////////////////////////////////// + +long MetUGridDataFile::convert_time_to_offset(long time_value) { + bool found = false; + bool found_value = false; + long time_offset = bad_data_int; + int dim_size = _file->ValidTime.n(); + static const string method_name + = "MetUGridDataFile::convert_time_to_offset() -> "; + + for (int idx=0; idxValidTime[idx] == time_value) { + time_offset = idx; + found = true; + break; + } + } + + if (!found) { + dim_size = _file->raw_times.n(); + for (int idx=0; idxraw_times[idx] == time_value) { + time_offset = idx; + found_value = true; + break; + } + } + } + + if (found) + mlog << Debug(7) << method_name << " Found " + << unix_to_yyyymmdd_hhmmss(time_value) + << " at index " << time_offset << " from time value\n"; + else if (found_value) + mlog << Debug(7) << method_name << " Found " << time_value + << " at index " << time_offset << " from time value\n"; + else + mlog << Warning << "\n" << method_name << time_value + << " does not exist at time variable\n\n"; + + return time_offset; +} + +//////////////////////////////////////////////////////////////////////// + +long MetUGridDataFile::convert_value_to_offset(double z_value, string z_dim_name) { + bool found = false; + long z_offset = bad_data_int; + int dim_size = _file->vlevels.n(); + static const string method_name + = "MetUGridDataFile::convert_value_to_offset() -> "; + + for (int idx=0; idxvlevels[idx], z_value)) { + found = true; + z_offset = idx; + break; + } + } + + if (!found && 0 < z_dim_name.length()) { + NcVarInfo *var_info = find_var_info_by_dim_name(_file->Var, z_dim_name, _file->Nvars); + if (var_info) { + long new_offset = get_index_at_nc_data(var_info->var, z_value, z_dim_name); + if (new_offset != bad_data_int) z_offset = new_offset; + } + } + + return z_offset; +} + +//////////////////////////////////////////////////////////////////////// diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.h b/src/libcode/vx_data2d_ugrid/data2d_ugrid.h new file mode 100644 index 0000000000..473254b660 --- /dev/null +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.h @@ -0,0 +1,125 @@ +// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* +// ** Copyright UCAR (c) 1992 - 2023 +// ** University Corporation for Atmospheric Research (UCAR) +// ** National Center for Atmospheric Research (NCAR) +// ** Research Applications Lab (RAL) +// ** P.O.Box 3000, Boulder, Colorado, 80307-3000, USA +// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* + + +//////////////////////////////////////////////////////////////////////// + + +#ifndef __MET_VX_DATA_2D_UGRID_H__ +#define __MET_VX_DATA_2D_UGRID_H__ + + +//////////////////////////////////////////////////////////////////////// + + +#include "data_plane.h" +#include "data_class.h" +#include "var_info_ugrid.h" +#include "ugrid_file.h" +#include "two_to_one.h" + + +//////////////////////////////////////////////////////////////////////// + + +class MetUGridDataFile : public Met2dDataFile { + + private: + + void ugrid_init_from_scratch(); + //NcVarInfo *find_first_data_var(); + long convert_time_to_offset(long time_value); + long convert_value_to_offset(double z_value, std::string z_dim_name); + LongArray collect_time_offsets(VarInfo &vinfo); + + MetUGridDataFile(const MetUGridDataFile &); + MetUGridDataFile & operator=(const MetUGridDataFile &); + + // + // NetCDF file + // + + UGridFile * _file; // allocated + long _cur_time_index; // current time index to get the data plane (for array of data_plane) + + protected: + + ConcatString meta_filename; + + public: + + MetUGridDataFile(); + ~MetUGridDataFile(); + + virtual int nx() const + { + if (_file == 0) + return 0; + + return _file->getNx(); + } + + + virtual int ny() const + { + return 1; + } + + + // + // set stuff + // + + // + // get stuff + // + + GrdFileType file_type() const; + + // retrieve the first matching data plane + + bool data_plane(VarInfo &, DataPlane &); + + // retrieve all matching data planes + + int data_plane_array(VarInfo &, DataPlaneArray &); + + // retrieve the index of the first matching record + + int index(VarInfo &); + + + // + // do stuff + // + + bool open (const char * filename); + bool open_metadata(const char * filename); + + void close (); + + void dump(std::ostream &, int = 0) const; + +}; + + +//////////////////////////////////////////////////////////////////////// + + +inline GrdFileType MetUGridDataFile::file_type () const { return ( FileType_UGrid ); } + + +//////////////////////////////////////////////////////////////////////// + + +#endif /* __MET_VX_DATA_2D_UGRID_H__ */ + + +//////////////////////////////////////////////////////////////////////// + + diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.cc b/src/libcode/vx_data2d_ugrid/ugrid_file.cc new file mode 100644 index 0000000000..2c6a2c8dd1 --- /dev/null +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.cc @@ -0,0 +1,902 @@ +// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* +// ** Copyright UCAR (c) 1992 - 2023 +// ** University Corporation for Atmospheric Research (UCAR) +// ** National Center for Atmospheric Research (NCAR) +// ** Research Applications Lab (RAL) +// ** P.O.Box 3000, Boulder, Colorado, 80307-3000, USA +// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* + + +//////////////////////////////////////////////////////////////////////// + + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "vx_math.h" +#include "vx_cal.h" +#include "vx_log.h" +#include "config_util.h" + +#include "ugrid_file.h" + +using namespace std; +using namespace netCDF; + + +//////////////////////////////////////////////////////////////////////// + +static const char *default_config_filename = + "MET_BASE/config/UGridConfig_default"; + +array DIM_KEYS = { + "dim_face", "dim_node", "dim_edge", "dim_time", "dim_vert" +}; + +array COORD_VAR_KEYS = { + "time", "lat_face", "lon_face", "vert_face", "lat_edge", + "lon_edge", "lat_node", "lon_node", "cell_id" +}; + +static double get_nc_var_att_double(const NcVar *nc_var, const char *att_name, + bool is_required=true); + +#define USE_BUFFER 1 + +//////////////////////////////////////////////////////////////////////// + + + // + // Code for class UGridFile + // + + +//////////////////////////////////////////////////////////////////////// + + +UGridFile::UGridFile() +{ + init_from_scratch(); +} + + +//////////////////////////////////////////////////////////////////////// + + +UGridFile::~UGridFile() +{ + close(); +} + + +//////////////////////////////////////////////////////////////////////// + + +void UGridFile::init_from_scratch() + +{ + // Initialize the pointers + + _ncFile = (NcFile *) nullptr; + _ncMetaFile = (NcFile *) nullptr; + Var = (NcVarInfo *) nullptr; + _time_var_info = (NcVarInfo *)nullptr; + + _faceDim = (NcDim *)nullptr; + _edgeDim = (NcDim *)nullptr; + _nodeDim = (NcDim *)nullptr; + _virtDim = (NcDim *)nullptr; + _tDim = (NcDim *)nullptr; + _latVar = (NcVar *)nullptr; + _lonVar = (NcVar *)nullptr; + _xCoordVar = (NcVar *)nullptr; + _yCoordVar = (NcVar *)nullptr; + + // Close any existing file + + close(); + + return; +} + + +//////////////////////////////////////////////////////////////////////// + + +void UGridFile::close() +{ + + // Reclaim the file pointer + + if (_ncFile) { + delete _ncFile; + _ncFile = (NcFile *)nullptr; + } + + if (_ncMetaFile) { + delete _ncMetaFile; + _ncMetaFile = (NcFile *)nullptr; + } + + // Reclaim the dimension pointers + + _numDims = 0; + + _dimNames.clear(); + metadata_map.clear(); + metadata_names.clear(); + + _faceDim = _edgeDim = _tDim = (NcDim *)nullptr; + + // Reclaim the variable pointers + + if (Var) { + delete [] Var; + Var = (NcVarInfo *)nullptr; + } + + Nvars = 0; + + // Reset the time values + + ValidTime.clear(); + raw_times.clear(); + vlevels.clear(); + InitTime = (unixtime)0; + AccumTime = (unixtime)0; + + face_count = 0; + + // done + + return; +} + + +//////////////////////////////////////////////////////////////////////// + + +bool UGridFile::open(const char * filepath) +{ + const char *method_name = "UGridFile::open() -> "; + + + // Close any open files and clear out the associated members + close(); + read_config(); + + if (_ncFile) { + delete _ncFile; + _ncFile = (NcFile *) nullptr; + } + + // Open the file + _ncFile = open_ncfile(filepath); + + if (IS_INVALID_NC_P(_ncFile)) + { + close(); + return false; + } + + // Pull out the variables + + NcDim dim; + int meta_count = 0; + int max_dim_count = 0; + ConcatString att_value; + StringArray var_names; + + Nvars = get_var_names(_ncFile, &var_names); + for (int j=0; j max_dim_count) max_dim_count = dim_count; + + Var[j].Dims = new NcDim * [dim_count]; + + // parse the variable attributes + get_att_str( Var[j], long_name_att_name, Var[j].long_name_att ); + get_att_str( Var[j], units_att_name, Var[j].units_att ); + + } // for j + + // done + + return true; +} + + +//////////////////////////////////////////////////////////////////////// + + +bool UGridFile::open_metadata(const char * filepath) +{ + unixtime ut; + int sec_per_unit; + const char *method_name = "UGridFile::open_metadata() -> "; + + // FIXME: Commented out with NetCDF4 enabling + // NcError err(NcError::silent_nonfatal); + + // Open the file + _ncMetaFile = open_ncfile(filepath); + + if (IS_INVALID_NC_P(_ncMetaFile)) { + close(); + return false; + } + + NcDim dim; + string meta_name; + StringArray dim_names; + StringArray meta_names; + + get_dim_names(_ncMetaFile, &dim_names); + + // Face (cell) dimension + meta_name = find_metadata_name(DIM_KEYS[0], dim_names); + if (0 < meta_name.length()) { + dim = get_nc_dim(_ncMetaFile, meta_name.c_str()); + face_count = get_dim_size(&dim); + _faceDim = new NcDim(dim); + } + + // Node (vertex) dimension + meta_name = find_metadata_name(DIM_KEYS[1], dim_names); + if (0 < meta_name.length()) { + dim = get_nc_dim(_ncMetaFile, meta_name.c_str()); + _nodeDim = new NcDim(dim); + } + + // Edge dimension + meta_name = find_metadata_name(DIM_KEYS[2], dim_names); + if (0 < meta_name.length()) { + dim = get_nc_dim(_ncMetaFile, meta_name.c_str()); + _edgeDim = new NcDim(dim); + } + + // Time dimension + meta_name = find_metadata_name(DIM_KEYS[3], dim_names); + if (0 < meta_name.length()) { + dim = get_nc_dim(_ncMetaFile, meta_name.c_str()); + _tDim = new NcDim(dim); + } + + // Vertical dimension + meta_name = find_metadata_name(DIM_KEYS[4], dim_names); + if (0 < meta_name.length()) { + dim = get_nc_dim(_ncMetaFile, meta_name.c_str()); + _virtDim = new NcDim(dim); + } + + int max_dim_count = 0; + StringArray var_names; + ConcatString att_value; + NcVar *z_var = (NcVar *)nullptr; + NcVar *valid_time_var = (NcVar *)nullptr; + + get_var_names(_ncMetaFile, &var_names); + + for (int j=0; j max_dim_count) max_dim_count = dim_count; + + // parse the variable attributes + get_att_str( MetaVar[j], long_name_att_name, MetaVar[j].long_name_att ); + get_att_str( MetaVar[j], units_att_name, MetaVar[j].units_att ); + + if (0 == j) { + valid_time_var = MetaVar[j].var; + _time_var_info = &MetaVar[j]; + } + else if (1== j) { + _latVar = MetaVar[j].var; + } + else if (2 == j) { + _lonVar = MetaVar[j].var; + } + else if (3 == j) { + z_var = MetaVar[j].var; + } + } + + } // for j + + StringArray meta_time_names = get_metadata_names(COORD_VAR_KEYS[0]); + for (int j=0; j 1 ) { + double latest_time = bad_data_double; + for(int i=0; i 0) { + unix_to_mdyhms(AccumTime, month, day, year, hour, minute, second); + snprintf(junk, sizeof(junk), "%2d:%02d:%02d (%d seconds)", + hour, minute, second, (int)AccumTime); + out << prefix << "Accum Time = "; + out << junk << "\n"; + out << prefix << "\n"; + } + + out << prefix << "\n"; + + out << prefix << "Nvars = " << Nvars << "\n"; + + for (int j = 0; j < Nvars; ++j) + { + out << p2 << "Var # " << j << " = " << (Var[j].name) << " ("; + + for (int k = 0; k < Var[j].Ndims; ++k) + { + if (Var[j].Dims[k] == _faceDim) + out << 'X'; + else if (Var[j].Dims[k] == _edgeDim) + out << 'Y'; + else if (Var[j].Dims[k] == _tDim) + out << 'T'; + else + out << GET_NC_NAME_P(Var[j].Dims[k]); + + if (k < Var[j].Ndims - 1) + out << ", "; + } // for k + + out << ")\n"; + + out << p2 << "\n"; + + } // for j + + // done + + out.flush(); + + return; +} + + +//////////////////////////////////////////////////////////////////////// + +std::string UGridFile::find_metadata_name(std::string &key, StringArray &available_names) { + string meta_name = ""; + StringArray meta_names = get_metadata_names(key); + + for (int idx=0; idx found " << meta_name + // << " for " << key << "\n"; + break; + } + } + return meta_name; +} + +//////////////////////////////////////////////////////////////////////// + + +NcVarInfo* UGridFile::find_var_name(const char * var_name) const +{ + cout << "UGridFile::find_var_name() Nvars=" << Nvars << ", " << var_name << "\n"; + for (int i = 0; i < Nvars; i++) + { + cout << "UGridFile::find_var_name() " << Var[i].name << " VS " << var_name << "\n"; + if (Var[i].name == var_name) + return &Var[i]; + } + return nullptr; +} + + +//////////////////////////////////////////////////////////////////////// + + +double UGridFile::getData(NcVar * var, const LongArray & a) const +{ + clock_t start_clock = clock(); + static const string method_name + = "UGridFile::getData(NcVar *, const LongArray &) -> "; + if (!args_ok(a)) + { + mlog << Error << "\n" << method_name + << "bad arguments:\n"; + a.dump(cerr); + exit(1); + } + + int dim_count = get_dim_count(var); + if (dim_count != a.n_elements()) + { + mlog << Error << "\n" << method_name + << "needed " << (dim_count) << " arguments for variable " + << (GET_NC_NAME_P(var)) << ", got " << (a.n_elements()) << "\n\n"; + exit(1); + } + + + for (int k=0; kgetDim(k).getSize(); + if (dim_size < a[k]) { + mlog << Error << "\n" << method_name + << "offset (" << a[k] << ") at " << k + << "th dimension (" << long(dim_size) << ") is too big for variable \"" + << GET_NC_NAME_P(var) << "\"\n\n"; + exit ( 1 ); + } + } + + bool status = false; + double d = bad_data_double; + + double fill_value; + double missing_value = get_var_missing_value(var); + get_var_fill_value(var, fill_value); + + status = get_nc_data(var, &d, a); + + if (!status) + { + mlog << Error << "\nUGridFile::getData(NcVar *, const LongArray &) const -> " + << "bad status for var->get()\n\n"; + exit(1); + } + + // done + + mlog << Debug(6) << method_name << "took " + << (clock()-start_clock)/double(CLOCKS_PER_SEC) << " seconds\n"; + + return d; +} + + +//////////////////////////////////////////////////////////////////////// + + +bool UGridFile::getData(NcVar * v, const LongArray & a, DataPlane & plane) const +{ + clock_t start_clock = clock(); + static const string method_name_short + = "UGridFile::getData(NcVar*, LongArray&, DataPlane&) "; + static const string method_name + = "UGridFile::getData(NcVar *, const LongArray &, DataPlane &) const -> "; + + if (!args_ok(a)) + { + mlog << Error << "\n" << method_name + << "bad arguments:\n"; + a.dump(cerr); + exit(1); + } + + int dim_count = get_dim_count(v); + if (dim_count != a.n_elements()) + { + mlog << Error << "\n" << method_name + << "needed " << (dim_count) << " arguments for variable " + << (GET_NC_NAME_P(v)) << ", got " << (a.n_elements()) << "\n\n"; + exit(1); + } + + // find varinfo's + + bool found = false; + NcVarInfo *var = (NcVarInfo *)nullptr; + + for (int j = 0; j < Nvars; ++j) + { + if (Var[j].var == v) + { + found = true; + var = Var + j; + break; + } + } + + if (!found) + { + mlog << Error << "\n" << method_name + << "variable " << (GET_NC_NAME_P(v)) << " not found!\n\n"; + exit(1); + } + + // check star positions and count + + // + // get the bad data values + // + + double fill_value; + double missing_value = get_var_missing_value(v); + get_var_fill_value(v, fill_value); + + // set up the DataPlane object + + const int nx = grid.nx(); + const int ny = grid.ny(); + + plane.clear(); + plane.set_size(nx, ny); + + // get the data + int *i; + short *s; + float *f; + const int plane_size = nx * ny; + double *d = new double[plane_size]; + + //get_nc_data(v, d, lengths, offsets); + get_nc_data(v, d); + + int offset = 0; + for (int x = 0; x< nx; ++x) { + double value = d[x]; + if( is_eq(value, missing_value) || is_eq(value, fill_value) ) { + value = bad_data_double; + } + + plane.set(value, x, 0); + + } // for x + + delete [] d; + + // done + mlog << Debug(6) << method_name << "took " + << (clock()-start_clock)/double(CLOCKS_PER_SEC) << " seconds\n"; + + return true; +} + + +//////////////////////////////////////////////////////////////////////// + + +bool UGridFile::getData(const char *var_name, + const LongArray &a, DataPlane &plane, + NcVarInfo *&info) const +{ + info = find_var_name(var_name); + if (info == nullptr) + return false; + + bool found = getData(info->var, a, plane); + + // store the times + unixtime valid_ut; + if(info->t_slot >= 0) valid_ut = ValidTime[a[info->t_slot]]; + else valid_ut = ValidTime[0]; + + // if unset, set the init time to the valid time + unixtime init_ut = InitTime; + if(init_ut == 0 && valid_ut != 0) { + mlog << Debug(4) << "UGridFile::getData() -> " + << "setting the unset init time to the valid time of " + << unix_to_yyyymmdd_hhmmss(valid_ut) << ".\n"; + init_ut = valid_ut; + } + + unixtime accum_time = info->AccumTime; + if ((0 == accum_time) && (AccumTime>0)) accum_time = AccumTime; + + plane.set_init(init_ut); + plane.set_valid(valid_ut); + plane.set_lead(valid_ut - init_ut); + plane.set_accum(accum_time); + + // done + + return found; +} + + +//////////////////////////////////////////////////////////////////////// + + +StringArray UGridFile::get_metadata_names(std::string &key) { + StringArray empty; + auto search = metadata_map.find(key); + return search == metadata_map.end() ? empty : metadata_map[key]; +} + + +//////////////////////////////////////////////////////////////////////// + + +int UGridFile::lead_time() const +{ + unixtime dt = ValidTime[0] - InitTime; + + return (int) dt; +} + + +//////////////////////////////////////////////////////////////////////// + + +void UGridFile::read_config() { + const char *method_name = "UGridFile::read_config()"; + MetConfig conf; + + // Read the default config file + conf.read(replace_path(default_config_filename).c_str()); + + metadata_map = parse_conf_metadata_map(&conf); + metadata_names.clear(); + for (std::map::iterator it=metadata_map.begin(); + it!=metadata_map.end(); ++it) { + metadata_names.add(it->second); + } + + mlog << Debug(4) << method_name + << " map size: " << metadata_map.size() << ", dims_vars_count = " << metadata_names.n() << "\n"; + +} + +//////////////////////////////////////////////////////////////////////// + + +void UGridFile::read_netcdf_grid() +{ + // Loop through the variables looking for the first gridded variable. We + // will use this variable to pull out the grid information. The CF + // description allows for different fields in the same file to have different + // grids, but with how the gridded information is used in MET, I'm making the + // assumption that all fields are on the same grid. + + ConcatString units_value; + const char *method_name = "UGridFile::read_netcdf_grid() -> "; + + double *_lat = new double[face_count]; + double *_lon = new double[face_count]; + + if (IS_INVALID_NC_P(_latVar)) { + mlog << Error << "\n" << method_name << "latitude variable is missing\n\n"; + exit(1); + } + else if (!get_nc_data(_latVar,_lat)) { + mlog << Error << "\n" << method_name << "fail to read latitude values\n\n"; + exit(1); + } + + if (IS_INVALID_NC_P(_lonVar)) { + mlog << Error << "\n" << method_name << "longitude variable is missing\n\n"; + exit(1); + } + else if (!get_nc_data(_lonVar,_lon)) { + mlog << Error << "\n" << method_name << "fail to read latitude values\n\n"; + exit(1); + } + + if (get_var_units(_latVar, units_value)) { + if (units_value == "rad" || units_value == "radian") { + mlog << Debug(6) << method_name << " convert lat (" < + +#include "vx_grid.h" +#include "nc_utils.h" +#include "data_plane.h" +#include "long_array.h" +#include "nc_var_info.h" + + +//////////////////////////////////////////////////////////////////////// + + +static const int UG_DIM_COUNT = 5; +static const int UG_META_VAR_COUNT = 9; + + +//////////////////////////////////////////////////////////////////////// + + +class UGridFile { + + public: + + UGridFile(); + ~UGridFile(); + + bool open(const char *filename); + bool open_metadata(const char *filename); + + void close(); + + void dump(std::ostream &, int = 0) const; + + + int getNx() const { + return (_faceDim == nullptr) ? 0 : GET_NC_SIZE_P(_faceDim); + } + + int getNy() const { + return 1; + } + + NcVarInfo *get_time_var_info() const { return _time_var_info; } + + // + // time + // + + TimeArray ValidTime; + NumArray raw_times; + NumArray vlevels; + + unixtime InitTime; + unixtime AccumTime; + + int lead_time () const; // seconds + + + // + // variables + // + + int Nvars; + + NcVarInfo *Var; // allocated + std::arrayMetaVar; + + // + // Grid + // + + Grid grid; + UnstructuredData grid_data; + + // + // data + // + + double getData(netCDF::NcVar *, const LongArray &) const; + + bool getData(netCDF::NcVar *, const LongArray &, DataPlane &) const; + + bool getData(const char *, const LongArray &, DataPlane &, NcVarInfo *&) const; + + NcVarInfo* find_var_name(const char * var_name) const; + + private: + + static const double DELTA_TOLERANCE; + + netCDF::NcFile * _ncFile; // allocated + netCDF::NcFile * _ncMetaFile; // allocated + + std::map metadata_map; + StringArray metadata_names; + + // + // dimensions + // + + int _numDims; + + //std::array _dims; // allocated + + StringArray _dimNames; + + // Pointers to the X/Y and time dimensions and the associated coordinate + // variables. Note that these are pointers into the _dims and Var + // arrays so should not be deleted. + + netCDF::NcDim *_faceDim; + netCDF::NcDim *_edgeDim; + netCDF::NcDim *_nodeDim; + netCDF::NcDim *_virtDim; + netCDF::NcDim *_tDim; + + netCDF::NcVar *_latVar; + netCDF::NcVar *_lonVar; + netCDF::NcVar *_xCoordVar; + netCDF::NcVar *_yCoordVar; + NcVarInfo *_time_var_info; + + int face_count; + //double *_lat; + //double *_lon; + + void init_from_scratch(); + + UGridFile(const UGridFile &); + UGridFile & operator=(const UGridFile &); + + // Determine the file times from the filename + + // Read the grid information from the netCDF file and fill in the + // grid member with that information. + + std::string find_metadata_name(std::string &key, StringArray &available_names); + StringArray get_metadata_names(std::string &key); + void read_config(); + void read_netcdf_grid(); + +}; + + +//////////////////////////////////////////////////////////////////////// + + +#endif /* __UGRID_FILE_H__ */ + + +//////////////////////////////////////////////////////////////////////// + + diff --git a/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc b/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc new file mode 100644 index 0000000000..7b1da7e5ab --- /dev/null +++ b/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc @@ -0,0 +1,470 @@ +// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* +// ** Copyright UCAR (c) 1992 - 2023 +// ** University Corporation for Atmospheric Research (UCAR) +// ** National Center for Atmospheric Research (NCAR) +// ** Research Applications Lab (RAL) +// ** P.O.Box 3000, Boulder, Colorado, 80307-3000, USA +// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* + +/////////////////////////////////////////////////////////////////////////////// +// +// Filename: var_info_ugrid.cc +// +// Description: +// +// Mod# Date Name Description +// ---- ---- ---- ----------- +// +/////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include + +#include "var_info.h" +#include "var_info_ugrid.h" + +#include "vx_math.h" +#include "util_constants.h" +#include "vx_log.h" +#include "grib_strings.h" + +using namespace std; + + +/////////////////////////////////////////////////////////////////////////////// + +static bool is_grib_code_abbr_match(const ConcatString &, int); + +/////////////////////////////////////////////////////////////////////////////// +// +// Code for class VarInfoUGrid +// +/////////////////////////////////////////////////////////////////////////////// + +VarInfoUGrid::VarInfoUGrid() { + + init_from_scratch(); +} + +/////////////////////////////////////////////////////////////////////////////// + +VarInfoUGrid::~VarInfoUGrid() { + + clear(); +} + +/////////////////////////////////////////////////////////////////////////////// + +VarInfoUGrid::VarInfoUGrid(const VarInfoUGrid &f) { + + init_from_scratch(); + + assign(f); +} + +/////////////////////////////////////////////////////////////////////////////// + +VarInfoUGrid & VarInfoUGrid::operator=(const VarInfoUGrid &f) { + + if ( this == &f ) return ( *this ); + + assign(f); + + return ( *this ); +} + +/////////////////////////////////////////////////////////////////////////////// + +void VarInfoUGrid::init_from_scratch() { + + // First call the parent's initialization + VarInfo::init_from_scratch(); + + clear(); + + return; +} + +/////////////////////////////////////////////////////////////////////////////// + +void VarInfoUGrid::assign(const VarInfoUGrid &v) { + int i; + + // First call the parent's assign + VarInfo::assign(v); + + // Copy + clear_dimension(); + for(i=0; i +#include +#include +#include +#include +#include + +#include "vx_math.h" +#include "vx_util.h" +#include "vx_log.h" +#include "unstructured_grid.h" + +#include "atlas/grid/Grid.h" // PointLonLat +#include "atlas/util/Geometry.h" +#include "atlas/util/KDTree.h" + +using namespace std; + +using PointLonLat = atlas::PointLonLat; +using Geometry = atlas::Geometry; +using IndexKDTree = atlas::util::IndexKDTree; + +//////////////////////////////////////////////////////////////////////// + + +static atlas::Geometry atlas_geometry; + +//////////////////////////////////////////////////////////////////////// + + + // + // Code for class UnstructuredGrid + // + + +//////////////////////////////////////////////////////////////////////// + + +UnstructuredGrid::UnstructuredGrid() { + clear(); +} + + +//////////////////////////////////////////////////////////////////////// + + +UnstructuredGrid::~UnstructuredGrid() { + clear(); +} + + +//////////////////////////////////////////////////////////////////////// + + +void UnstructuredGrid::clear() { + + Name.clear(); + + Nx = 0; + wrapLon = false; + + Data.clear(); + return; + +} + + +//////////////////////////////////////////////////////////////////////// + + +UnstructuredGrid::UnstructuredGrid(const UnstructuredData & data) { + + set_from_data(data); + +} + + +//////////////////////////////////////////////////////////////////////// + +void UnstructuredGrid::set_from_data(const UnstructuredData &data) { + + Data.clear(); + + if (data.name) Name = data.name; + Nx = data.Nface;; + + Data.Nface = Nx; + Data.Nedge = data.Nedge; + Data.Nnode = data.Nnode; + + Data.set_points(Nx, data.pointLonLat); + + return; + +} + +//////////////////////////////////////////////////////////////////////// + + +void UnstructuredGrid::latlon_to_xy(double lat, double lon, double &x, double &y) const { + + PointLonLat _pointLonLat(lon, lat); + y = 0; + + IndexKDTree::ValueList neighbor = Data.kdtree->closestPoints(_pointLonLat, 1); + size_t index(neighbor[0].payload()); + x = index; + + mlog << Debug(7) << "UnstructuredGrid::latlon_to_xy() " + << "(" << lon << ", " << lat << ") ==> (" << x << ", " << y << ")\n"; + +} + + +//////////////////////////////////////////////////////////////////////// + + +void UnstructuredGrid::xy_to_latlon(double x, double y, double &lat, double &lon) const { + + lat = Data.pointLonLat[x].y(); + lon = Data.pointLonLat[x].x(); + + mlog << Debug(7) << "UnstructuredGrid::xy_to_latlon() " + << "(" << x << ", " << y << ") ==> (" << lon << ", " << lat << ").\n"; + +} + + +//////////////////////////////////////////////////////////////////////// + +double UnstructuredGrid::calc_area(int x, int y) const { + + double area = 0.; + + return ( area ); + +} + +//////////////////////////////////////////////////////////////////////// + + +int UnstructuredGrid::nx() const { + + return Nx; + +} + + +//////////////////////////////////////////////////////////////////////// + + +int UnstructuredGrid::ny() const { + + return 1; + +} + + +//////////////////////////////////////////////////////////////////////// + + +ConcatString UnstructuredGrid::name() const { + + return Name; + +} + + +//////////////////////////////////////////////////////////////////////// + + +void UnstructuredGrid::dump(ostream & out, int depth) const { + +Indent prefix(depth); + +out << prefix << "Name = "; + +if ( Name.length() > 0 ) out << '\"' << Name << '\"'; +else out << "(nul)\n"; + +out << '\n'; + +out << prefix << "Nface = " << Nx << "\n"; + + // + // done + // +out.flush(); + +return; + +} + + +//////////////////////////////////////////////////////////////////////// + + +ConcatString UnstructuredGrid::serialize(const char *sep) const { + +ConcatString a; +char junk[256]; + + +a << "Projection: UnstructuredGrid" << sep; + +a << "Nface: " << Nx << sep; + // + // done + // + +return a; + +} + + +//////////////////////////////////////////////////////////////////////// + + +GridInfo UnstructuredGrid::info() const { + +GridInfo i; + +i.set( Data ); + +return i; + +} + + +//////////////////////////////////////////////////////////////////////// + +double UnstructuredGrid::rot_grid_to_earth(int x, int y) const + +{ + +// +// The rotation angle from grid relative to earth relative is zero +// for the PlateCarreeGrids that are defined north and east. This may +// need to be changed when support is added for GRIB2. +// + +return 0.0; + +} + +//////////////////////////////////////////////////////////////////////// + +void UnstructuredGrid::shift_right(int N) +{ + + mlog << Warning << "\nUnstructuredGrid::shift_right(int) -> not implemented\n\n"; + +} + +//////////////////////////////////////////////////////////////////////// + + +GridRep * UnstructuredGrid::copy() const { + + UnstructuredGrid *p = new UnstructuredGrid (Data); + + p->Name = Name; + + return p; + +} + + +//////////////////////////////////////////////////////////////////////// + + + // + // Code for misc functions + // + + +//////////////////////////////////////////////////////////////////////// + + +Grid::Grid(const UnstructuredData &data) { + + init_from_scratch(); + + set(data); + +} + + +//////////////////////////////////////////////////////////////////////// + + +void Grid::set(const UnstructuredData &data) { + clear(); + + rep = new UnstructuredGrid ( data ); + if ( !rep ) { + mlog << Error << "\nGrid::set(const Unstructured &) -> memory allocation error\n\n"; + exit ( 1 ); + } +} + + +//////////////////////////////////////////////////////////////////////// + + +UnstructuredData::UnstructuredData() { + kdtree = nullptr; + clear(); +} + +//////////////////////////////////////////////////////////////////////// + +UnstructuredData::~UnstructuredData() { + clear(); +} + +//////////////////////////////////////////////////////////////////////// + +void UnstructuredData::build_tree() { + + atlas::idx_t n = 0; + kdtree = new IndexKDTree(atlas_geometry); + for (int i=0; iinsert(pointLL, n++); + } + + kdtree->build(); + +} + +//////////////////////////////////////////////////////////////////////// + +void UnstructuredData::set_points(int count, double *_lon, double *_lat) { + + clear(); + + Nface = count; + pointLonLat.reserve(Nface); + for (int i=0; i &_pointLonLat) { + + clear(); + + Nface = count; + pointLonLat.reserve(Nface); + + for (int i=0; i &) (" + << pointLonLat[0].x() << ", " << pointLonLat[0].y() << ") and (" + << pointLonLat[count-1].x() << ", " << pointLonLat[count-1].y() << ") from (" + << _pointLonLat[0].x() << ", " << _pointLonLat[0].y() << ") and (" + << _pointLonLat[count-1].x() << ", " << _pointLonLat[count-1].y() << ")\n"; + + build_tree(); + +} + +//////////////////////////////////////////////////////////////////////// diff --git a/src/libcode/vx_grid/unstructured_grid.h b/src/libcode/vx_grid/unstructured_grid.h new file mode 100644 index 0000000000..bf377b1d13 --- /dev/null +++ b/src/libcode/vx_grid/unstructured_grid.h @@ -0,0 +1,97 @@ +// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* +// ** Copyright UCAR (c) 1992 - 2023 +// ** University Corporation for Atmospheric Research (UCAR) +// ** National Center for Atmospheric Research (NCAR) +// ** Research Applications Lab (RAL) +// ** P.O.Box 3000, Boulder, Colorado, 80307-3000, USA +// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* + + +//////////////////////////////////////////////////////////////////////// + + +#ifndef __UNSTRUCTURTED_GRID_H__ +#define __UNSTRUCTURTED_GRID_H__ + + +//////////////////////////////////////////////////////////////////////// + + +#include "grid_base.h" + + +//////////////////////////////////////////////////////////////////////// + + +class UnstructuredGrid : public GridRep { + + friend class Grid; + + protected: + + UnstructuredGrid(); + ~UnstructuredGrid(); + UnstructuredGrid(const UnstructuredData &); + + + int Nx; + + + bool wrapLon; + + ConcatString Name; + + UnstructuredData Data; + + void clear(); + + void set_from_data(const UnstructuredData &); + + // + // grid interface + // + + virtual void latlon_to_xy(double lat, double lon, double & x, double & y) const; + + virtual void xy_to_latlon(double x, double y, double & lat, double & lon) const; + + virtual double calc_area(int x, int y) const; + + virtual int nx() const; + virtual int ny() const; + + double scale_km() const; + + virtual ConcatString name() const; + + void dump(std::ostream &, int = 0) const; + + ConcatString serialize(const char *sep=" ") const; + + GridInfo info() const; + + double rot_grid_to_earth(int x, int y) const; + + bool wrap_lon() const; + + void shift_right(int); + + GridRep * copy() const; + +}; + + +//////////////////////////////////////////////////////////////////////// + + +inline double UnstructuredGrid::scale_km() const { return ( -1.0 ); } +inline bool UnstructuredGrid::wrap_lon() const { return ( wrapLon ); } + + +//////////////////////////////////////////////////////////////////////// + + +#endif // __UNSTRUCTURTED_GRID_H__ + + +//////////////////////////////////////////////////////////////////////// diff --git a/src/libcode/vx_grid/unstructured_grid_defs.h b/src/libcode/vx_grid/unstructured_grid_defs.h new file mode 100644 index 0000000000..b95d5df001 --- /dev/null +++ b/src/libcode/vx_grid/unstructured_grid_defs.h @@ -0,0 +1,64 @@ +// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* +// ** Copyright UCAR (c) 1992 - 2023 +// ** University Corporation for Atmospheric Research (UCAR) +// ** National Center for Atmospheric Research (NCAR) +// ** Research Applications Lab (RAL) +// ** P.O.Box 3000, Boulder, Colorado, 80307-3000, USA +// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* + + +//////////////////////////////////////////////////////////////////////// + + +#ifndef __UNSTRUCTURTED_GRID_DEFINITIONS_H__ +#define __UNSTRUCTURTED_GRID_DEFINITIONS_H__ + + +//////////////////////////////////////////////////////////////////////// + + +#include + +#include "atlas/grid/Grid.h" // PointLonLat +#include "atlas/util/Geometry.h" +#include "atlas/util/KDTree.h" + + +//////////////////////////////////////////////////////////////////////// + + +//////////////////////////////////////////////////////////////////////// + + + + +struct UnstructuredData { + + const char * name; // not allocated + + int Nface; + int Nedge; + int Nnode; + + std::vector pointLonLat; + atlas::util::IndexKDTree *kdtree; + + UnstructuredData(); + ~UnstructuredData(); + + void build_tree(); + void set_points(int count, double *_lon, double *_lat); + void set_points(int count, const std::vector &); + void clear(); + + void dump() const; +}; + + +//////////////////////////////////////////////////////////////////////// + + +#endif /* __UNSTRUCTURTED_GRID_DEFINITIONS_H__ */ + + +//////////////////////////////////////////////////////////////////////// From 3d50857b5ba4901ce7788d5ce6b724fbec499a7c Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 12 Sep 2023 15:42:17 -0600 Subject: [PATCH 014/109] #2231 Initial release --- src/libcode/vx_data2d_ugrid/vx_data2d_ugrid.h | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/libcode/vx_data2d_ugrid/vx_data2d_ugrid.h diff --git a/src/libcode/vx_data2d_ugrid/vx_data2d_ugrid.h b/src/libcode/vx_data2d_ugrid/vx_data2d_ugrid.h new file mode 100644 index 0000000000..3156f8a9b7 --- /dev/null +++ b/src/libcode/vx_data2d_ugrid/vx_data2d_ugrid.h @@ -0,0 +1,38 @@ + + +// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* +// ** Copyright UCAR (c) 1992 - 2023 +// ** University Corporation for Atmospheric Research (UCAR) +// ** National Center for Atmospheric Research (NCAR) +// ** Research Applications Lab (RAL) +// ** P.O.Box 3000, Boulder, Colorado, 80307-3000, USA +// *=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=* + + + + +//////////////////////////////////////////////////////////////////////// + + +#ifndef __VX_DATA2D_UGRID_H__ +#define __VX_DATA2D_UGRID_H__ + + +//////////////////////////////////////////////////////////////////////// + + +#include "data2d_ugrid.h" +#include "var_info_ugrid.h" +#include "ugrid_file.h" + + +//////////////////////////////////////////////////////////////////////// + + +#endif // __VX_DATA2D_UGRID_H__ + + +//////////////////////////////////////////////////////////////////////// + + + From 721825b7b210321232c4e6a5c5e7e7a427c3b939 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 12 Sep 2023 15:43:42 -0600 Subject: [PATCH 015/109] #2231 Added vx_data2d_ugrid --- internal/test_util/libcode/vx_data2d/Makefile.am | 1 + internal/test_util/libcode/vx_data2d/Makefile.in | 1 + .../test_util/libcode/vx_data2d_factory/Makefile.am | 1 + .../test_util/libcode/vx_data2d_factory/Makefile.in | 1 + .../test_util/libcode/vx_data2d_grib/Makefile.am | 1 + .../test_util/libcode/vx_data2d_grib/Makefile.in | 1 + .../test_util/libcode/vx_data2d_nc_met/Makefile.am | 1 + .../test_util/libcode/vx_data2d_nc_met/Makefile.in | 1 + .../test_util/libcode/vx_data2d_nccf/Makefile.am | 1 + .../test_util/libcode/vx_data2d_nccf/Makefile.in | 1 + internal/test_util/libcode/vx_grid/Makefile.am | 5 +++-- internal/test_util/libcode/vx_grid/Makefile.in | 5 +++-- .../tools/other/mode_time_domain/Makefile.am | 1 + .../tools/other/mode_time_domain/Makefile.in | 1 + src/tools/Makefile.in | 6 ++++++ src/tools/core/Makefile.in | 6 ++++++ src/tools/core/ensemble_stat/Makefile.am | 3 ++- src/tools/core/ensemble_stat/Makefile.in | 9 ++++++++- src/tools/core/mode/Makefile.am | 3 ++- src/tools/core/mode/Makefile.in | 9 ++++++++- src/tools/core/mode_analysis/Makefile.am | 1 + src/tools/core/mode_analysis/Makefile.in | 7 +++++++ src/tools/core/pcp_combine/Makefile.am | 1 + src/tools/core/pcp_combine/Makefile.in | 7 +++++++ src/tools/core/point_stat/Makefile.am | 3 ++- src/tools/core/series_analysis/Makefile.am | 3 ++- src/tools/core/series_analysis/Makefile.in | 9 ++++++++- src/tools/core/stat_analysis/Makefile.am | 3 ++- src/tools/core/stat_analysis/Makefile.in | 9 ++++++++- src/tools/core/wavelet_stat/Makefile.am | 3 ++- src/tools/core/wavelet_stat/Makefile.in | 9 ++++++++- src/tools/dev_utils/Makefile.am | 1 + src/tools/dev_utils/Makefile.in | 7 +++++++ src/tools/dev_utils/shapefiles/Makefile.in | 6 ++++++ src/tools/other/Makefile.in | 6 ++++++ src/tools/other/ascii2nc/Makefile.am | 1 + src/tools/other/ascii2nc/Makefile.in | 7 +++++++ src/tools/other/gen_ens_prod/Makefile.am | 3 ++- src/tools/other/gen_ens_prod/Makefile.in | 9 ++++++++- src/tools/other/gen_vx_mask/Makefile.am | 1 + src/tools/other/gen_vx_mask/Makefile.in | 7 +++++++ src/tools/other/gis_utils/Makefile.in | 6 ++++++ src/tools/other/grid_diag/Makefile.am | 1 + src/tools/other/grid_diag/Makefile.in | 7 +++++++ src/tools/other/gsi_tools/Makefile.am | 6 ++++-- src/tools/other/gsi_tools/Makefile.in | 12 ++++++++++-- src/tools/other/ioda2nc/Makefile.am | 1 + src/tools/other/ioda2nc/Makefile.in | 7 +++++++ src/tools/other/lidar2nc/Makefile.am | 1 + src/tools/other/lidar2nc/Makefile.in | 7 +++++++ src/tools/other/madis2nc/Makefile.am | 1 + src/tools/other/madis2nc/Makefile.in | 7 +++++++ src/tools/other/mode_graphics/Makefile.am | 1 + src/tools/other/mode_graphics/Makefile.in | 7 +++++++ src/tools/other/mode_time_domain/Makefile.am | 1 + src/tools/other/mode_time_domain/Makefile.in | 7 +++++++ src/tools/other/modis_regrid/Makefile.am | 1 + src/tools/other/modis_regrid/Makefile.in | 7 +++++++ src/tools/other/pb2nc/Makefile.am | 1 + src/tools/other/pb2nc/Makefile.in | 7 +++++++ src/tools/other/plot_data_plane/Makefile.am | 1 + src/tools/other/plot_data_plane/Makefile.in | 7 +++++++ src/tools/other/plot_point_obs/Makefile.am | 1 + src/tools/other/plot_point_obs/Makefile.in | 7 +++++++ src/tools/other/point2grid/Makefile.am | 1 + src/tools/other/point2grid/Makefile.in | 7 +++++++ src/tools/other/regrid_data_plane/Makefile.am | 1 + src/tools/other/regrid_data_plane/Makefile.in | 7 +++++++ src/tools/other/shift_data_plane/Makefile.am | 1 + src/tools/other/shift_data_plane/Makefile.in | 7 +++++++ src/tools/other/wwmca_tool/Makefile.am | 2 ++ src/tools/other/wwmca_tool/Makefile.in | 8 ++++++++ src/tools/tc_utils/Makefile.in | 6 ++++++ src/tools/tc_utils/rmw_analysis/Makefile.am | 1 + src/tools/tc_utils/rmw_analysis/Makefile.in | 7 +++++++ src/tools/tc_utils/tc_diag/Makefile.am | 1 + src/tools/tc_utils/tc_diag/Makefile.in | 7 +++++++ src/tools/tc_utils/tc_dland/Makefile.am | 1 + src/tools/tc_utils/tc_dland/Makefile.in | 7 +++++++ src/tools/tc_utils/tc_gen/Makefile.am | 1 + src/tools/tc_utils/tc_gen/Makefile.in | 7 +++++++ src/tools/tc_utils/tc_pairs/Makefile.am | 1 + src/tools/tc_utils/tc_pairs/Makefile.in | 7 +++++++ src/tools/tc_utils/tc_rmw/Makefile.am | 1 + src/tools/tc_utils/tc_rmw/Makefile.in | 7 +++++++ src/tools/tc_utils/tc_stat/Makefile.am | 1 + src/tools/tc_utils/tc_stat/Makefile.in | 7 +++++++ 87 files changed, 340 insertions(+), 21 deletions(-) diff --git a/internal/test_util/libcode/vx_data2d/Makefile.am b/internal/test_util/libcode/vx_data2d/Makefile.am index 7e3c1ffd77..27b3d1409c 100644 --- a/internal/test_util/libcode/vx_data2d/Makefile.am +++ b/internal/test_util/libcode/vx_data2d/Makefile.am @@ -34,6 +34,7 @@ dump_default_table_LDFLAGS = -L. ${MET_LDFLAGS} dump_default_table_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_log \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_data2d \ -lvx_grid \ -lvx_geodesy \ diff --git a/internal/test_util/libcode/vx_data2d/Makefile.in b/internal/test_util/libcode/vx_data2d/Makefile.in index 40b6b92ed3..d366465daa 100644 --- a/internal/test_util/libcode/vx_data2d/Makefile.in +++ b/internal/test_util/libcode/vx_data2d/Makefile.in @@ -353,6 +353,7 @@ dump_default_table_LDFLAGS = -L. ${MET_LDFLAGS} dump_default_table_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_log \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_data2d \ -lvx_grid \ -lvx_geodesy \ diff --git a/internal/test_util/libcode/vx_data2d_factory/Makefile.am b/internal/test_util/libcode/vx_data2d_factory/Makefile.am index 78d54d8936..9b8a751186 100644 --- a/internal/test_util/libcode/vx_data2d_factory/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_factory/Makefile.am @@ -36,6 +36,7 @@ test_factory_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/internal/test_util/libcode/vx_data2d_factory/Makefile.in b/internal/test_util/libcode/vx_data2d_factory/Makefile.in index 3a138d8f8a..430ce5e9f3 100644 --- a/internal/test_util/libcode/vx_data2d_factory/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_factory/Makefile.in @@ -353,6 +353,7 @@ test_factory_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/internal/test_util/libcode/vx_data2d_grib/Makefile.am b/internal/test_util/libcode/vx_data2d_grib/Makefile.am index e03b42df6e..6b095600ee 100644 --- a/internal/test_util/libcode/vx_data2d_grib/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_grib/Makefile.am @@ -16,6 +16,7 @@ test_read_grib1_SOURCES = test_read_grib1.cc test_read_grib1_CPPFLAGS = ${MET_CPPFLAGS} test_read_grib1_LDFLAGS = -L. ${MET_LDFLAGS} test_read_grib1_LDADD = -lvx_data2d_grib \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_data2d \ -lvx_grid \ -lvx_geodesy \ diff --git a/internal/test_util/libcode/vx_data2d_grib/Makefile.in b/internal/test_util/libcode/vx_data2d_grib/Makefile.in index 8bc11a2c64..508ca72877 100644 --- a/internal/test_util/libcode/vx_data2d_grib/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_grib/Makefile.in @@ -327,6 +327,7 @@ test_read_grib1_SOURCES = test_read_grib1.cc test_read_grib1_CPPFLAGS = ${MET_CPPFLAGS} test_read_grib1_LDFLAGS = -L. ${MET_LDFLAGS} test_read_grib1_LDADD = -lvx_data2d_grib \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_data2d \ -lvx_grid \ -lvx_geodesy \ diff --git a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am index e32ef23772..5b7ce18f8c 100644 --- a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am @@ -16,6 +16,7 @@ test_read_nc_met_SOURCES = test_read_nc_met.cc test_read_nc_met_CPPFLAGS = ${MET_CPPFLAGS} test_read_nc_met_LDFLAGS = -L. ${MET_LDFLAGS} test_read_nc_met_LDADD = -lvx_data2d_nc_met \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_nc_util \ -lvx_data2d \ -lvx_grid \ diff --git a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in index 50622e97a4..ea68ce11ea 100644 --- a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in @@ -328,6 +328,7 @@ test_read_nc_met_SOURCES = test_read_nc_met.cc test_read_nc_met_CPPFLAGS = ${MET_CPPFLAGS} test_read_nc_met_LDFLAGS = -L. ${MET_LDFLAGS} test_read_nc_met_LDADD = -lvx_data2d_nc_met \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_nc_util \ -lvx_data2d \ -lvx_grid \ diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.am b/internal/test_util/libcode/vx_data2d_nccf/Makefile.am index 151f5f84d6..554a72d826 100644 --- a/internal/test_util/libcode/vx_data2d_nccf/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_nccf/Makefile.am @@ -16,6 +16,7 @@ test_read_nccf_SOURCES = test_read_nccf.cc test_read_nccf_CPPFLAGS = ${MET_CPPFLAGS} test_read_nccf_LDFLAGS = -L. ${MET_LDFLAGS} test_read_nccf_LDADD = -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_nc_util \ -lvx_data2d \ -lvx_grid \ diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in index a4cb6aee34..196d0855d6 100644 --- a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in @@ -326,6 +326,7 @@ test_read_nccf_SOURCES = test_read_nccf.cc test_read_nccf_CPPFLAGS = ${MET_CPPFLAGS} test_read_nccf_LDFLAGS = -L. ${MET_LDFLAGS} test_read_nccf_LDADD = -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_nc_util \ -lvx_data2d \ -lvx_grid \ diff --git a/internal/test_util/libcode/vx_grid/Makefile.am b/internal/test_util/libcode/vx_grid/Makefile.am index 271b4e3460..259ab24d0d 100644 --- a/internal/test_util/libcode/vx_grid/Makefile.am +++ b/internal/test_util/libcode/vx_grid/Makefile.am @@ -15,8 +15,9 @@ noinst_PROGRAMS = test_grid_area test_grid_area_SOURCES = test_grid_area.cc test_grid_area_CPPFLAGS = ${MET_CPPFLAGS} test_grid_area_LDFLAGS = -L. ${MET_LDFLAGS} -test_grid_area_LDADD = -lvx_grid \ - -lvx_geodesy \ +test_grid_area_LDADD = \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + -lvx_grid \ -lvx_geodesy \ -lvx_nav \ -lvx_util_math \ diff --git a/internal/test_util/libcode/vx_grid/Makefile.in b/internal/test_util/libcode/vx_grid/Makefile.in index c71c31fe3a..1337d0b370 100644 --- a/internal/test_util/libcode/vx_grid/Makefile.in +++ b/internal/test_util/libcode/vx_grid/Makefile.in @@ -325,8 +325,9 @@ MAINTAINERCLEANFILES = Makefile.in test_grid_area_SOURCES = test_grid_area.cc test_grid_area_CPPFLAGS = ${MET_CPPFLAGS} test_grid_area_LDFLAGS = -L. ${MET_LDFLAGS} -test_grid_area_LDADD = -lvx_grid \ - -lvx_geodesy \ +test_grid_area_LDADD = \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + -lvx_grid \ -lvx_geodesy \ -lvx_nav \ -lvx_util_math \ diff --git a/internal/test_util/tools/other/mode_time_domain/Makefile.am b/internal/test_util/tools/other/mode_time_domain/Makefile.am index 496e79f330..d2a4ad1fe5 100644 --- a/internal/test_util/tools/other/mode_time_domain/Makefile.am +++ b/internal/test_util/tools/other/mode_time_domain/Makefile.am @@ -58,6 +58,7 @@ test_velocity_LDADD = \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/internal/test_util/tools/other/mode_time_domain/Makefile.in b/internal/test_util/tools/other/mode_time_domain/Makefile.in index 5fa5c7d34f..bcd7d2584f 100644 --- a/internal/test_util/tools/other/mode_time_domain/Makefile.in +++ b/internal/test_util/tools/other/mode_time_domain/Makefile.in @@ -393,6 +393,7 @@ test_velocity_LDADD = \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in index 1d5afeee2b..e3c77abd53 100644 --- a/src/tools/Makefile.in +++ b/src/tools/Makefile.in @@ -225,11 +225,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/tools/core/Makefile.in b/src/tools/core/Makefile.in index fe26ee596f..cf6a4aeacc 100644 --- a/src/tools/core/Makefile.in +++ b/src/tools/core/Makefile.in @@ -233,11 +233,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/tools/core/ensemble_stat/Makefile.am b/src/tools/core/ensemble_stat/Makefile.am index f4870d0d69..d2edff9a27 100644 --- a/src/tools/core/ensemble_stat/Makefile.am +++ b/src/tools/core/ensemble_stat/Makefile.am @@ -25,10 +25,11 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/core/ensemble_stat/Makefile.in b/src/tools/core/ensemble_stat/Makefile.in index 10ec728d48..e4c4e70fec 100644 --- a/src/tools/core/ensemble_stat/Makefile.in +++ b/src/tools/core/ensemble_stat/Makefile.in @@ -216,11 +216,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -336,10 +342,11 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/core/mode/Makefile.am b/src/tools/core/mode/Makefile.am index be5aa15e6e..70bbaf552d 100644 --- a/src/tools/core/mode/Makefile.am +++ b/src/tools/core/mode/Makefile.am @@ -45,9 +45,10 @@ mode_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/core/mode/Makefile.in b/src/tools/core/mode/Makefile.in index 324734bfa1..02ae7f6991 100644 --- a/src/tools/core/mode/Makefile.in +++ b/src/tools/core/mode/Makefile.in @@ -233,11 +233,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -373,9 +379,10 @@ mode_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/core/mode_analysis/Makefile.am b/src/tools/core/mode_analysis/Makefile.am index 95ce39e441..0611f87b30 100644 --- a/src/tools/core/mode_analysis/Makefile.am +++ b/src/tools/core/mode_analysis/Makefile.am @@ -29,6 +29,7 @@ mode_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/core/mode_analysis/Makefile.in b/src/tools/core/mode_analysis/Makefile.in index 65fe67c86f..4510213632 100644 --- a/src/tools/core/mode_analysis/Makefile.in +++ b/src/tools/core/mode_analysis/Makefile.in @@ -216,11 +216,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -340,6 +346,7 @@ mode_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/core/pcp_combine/Makefile.am b/src/tools/core/pcp_combine/Makefile.am index 047e7f3fe6..d9205bfcf9 100644 --- a/src/tools/core/pcp_combine/Makefile.am +++ b/src/tools/core/pcp_combine/Makefile.am @@ -20,6 +20,7 @@ pcp_combine_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/core/pcp_combine/Makefile.in b/src/tools/core/pcp_combine/Makefile.in index 2508fde598..c5590eec67 100644 --- a/src/tools/core/pcp_combine/Makefile.in +++ b/src/tools/core/pcp_combine/Makefile.in @@ -213,11 +213,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -327,6 +333,7 @@ pcp_combine_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/core/point_stat/Makefile.am b/src/tools/core/point_stat/Makefile.am index 72fd3afa13..c9f3a47f7e 100644 --- a/src/tools/core/point_stat/Makefile.am +++ b/src/tools/core/point_stat/Makefile.am @@ -24,10 +24,11 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/core/series_analysis/Makefile.am b/src/tools/core/series_analysis/Makefile.am index dc9bf9b4b6..82b0532e88 100644 --- a/src/tools/core/series_analysis/Makefile.am +++ b/src/tools/core/series_analysis/Makefile.am @@ -26,9 +26,10 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/core/series_analysis/Makefile.in b/src/tools/core/series_analysis/Makefile.in index 44a0b546cd..c73af62d40 100644 --- a/src/tools/core/series_analysis/Makefile.in +++ b/src/tools/core/series_analysis/Makefile.in @@ -217,11 +217,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -338,9 +344,10 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/core/stat_analysis/Makefile.am b/src/tools/core/stat_analysis/Makefile.am index 7243d38298..f5ad4be10a 100644 --- a/src/tools/core/stat_analysis/Makefile.am +++ b/src/tools/core/stat_analysis/Makefile.am @@ -29,9 +29,10 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/core/stat_analysis/Makefile.in b/src/tools/core/stat_analysis/Makefile.in index 2336e6fbc8..4ebcf62d97 100644 --- a/src/tools/core/stat_analysis/Makefile.in +++ b/src/tools/core/stat_analysis/Makefile.in @@ -222,11 +222,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -346,9 +352,10 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/core/wavelet_stat/Makefile.am b/src/tools/core/wavelet_stat/Makefile.am index b7f82f764d..f827007742 100644 --- a/src/tools/core/wavelet_stat/Makefile.am +++ b/src/tools/core/wavelet_stat/Makefile.am @@ -32,9 +32,10 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/core/wavelet_stat/Makefile.in b/src/tools/core/wavelet_stat/Makefile.in index 3f2d2b0469..ce2ace46d7 100644 --- a/src/tools/core/wavelet_stat/Makefile.in +++ b/src/tools/core/wavelet_stat/Makefile.in @@ -216,11 +216,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -343,9 +349,10 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/dev_utils/Makefile.am b/src/tools/dev_utils/Makefile.am index c9daba3cf8..4dd98cadf6 100644 --- a/src/tools/dev_utils/Makefile.am +++ b/src/tools/dev_utils/Makefile.am @@ -128,6 +128,7 @@ gen_climo_bin_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/dev_utils/Makefile.in b/src/tools/dev_utils/Makefile.in index 31181b9f20..113a0bcbac 100644 --- a/src/tools/dev_utils/Makefile.in +++ b/src/tools/dev_utils/Makefile.in @@ -359,11 +359,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -572,6 +578,7 @@ gen_climo_bin_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/dev_utils/shapefiles/Makefile.in b/src/tools/dev_utils/shapefiles/Makefile.in index de5d8fec1f..aa75ce2c42 100644 --- a/src/tools/dev_utils/shapefiles/Makefile.in +++ b/src/tools/dev_utils/shapefiles/Makefile.in @@ -212,11 +212,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/tools/other/Makefile.in b/src/tools/other/Makefile.in index 52bafebb9c..1142dca82c 100644 --- a/src/tools/other/Makefile.in +++ b/src/tools/other/Makefile.in @@ -245,11 +245,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/tools/other/ascii2nc/Makefile.am b/src/tools/other/ascii2nc/Makefile.am index 6c123107be..3c4beb9904 100644 --- a/src/tools/other/ascii2nc/Makefile.am +++ b/src/tools/other/ascii2nc/Makefile.am @@ -41,6 +41,7 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/ascii2nc/Makefile.in b/src/tools/other/ascii2nc/Makefile.in index a4ed87b60b..a1c6ddbaff 100644 --- a/src/tools/other/ascii2nc/Makefile.in +++ b/src/tools/other/ascii2nc/Makefile.in @@ -261,11 +261,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -391,6 +397,7 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/gen_ens_prod/Makefile.am b/src/tools/other/gen_ens_prod/Makefile.am index 4fdce9ab82..740a258b7e 100644 --- a/src/tools/other/gen_ens_prod/Makefile.am +++ b/src/tools/other/gen_ens_prod/Makefile.am @@ -25,10 +25,11 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/other/gen_ens_prod/Makefile.in b/src/tools/other/gen_ens_prod/Makefile.in index a061b0909d..970cb07870 100644 --- a/src/tools/other/gen_ens_prod/Makefile.in +++ b/src/tools/other/gen_ens_prod/Makefile.in @@ -216,11 +216,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -336,10 +342,11 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/other/gen_vx_mask/Makefile.am b/src/tools/other/gen_vx_mask/Makefile.am index e05a781e0e..c3206a3264 100644 --- a/src/tools/other/gen_vx_mask/Makefile.am +++ b/src/tools/other/gen_vx_mask/Makefile.am @@ -22,6 +22,7 @@ gen_vx_mask_LDADD = -lvx_shapedata \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_gis \ diff --git a/src/tools/other/gen_vx_mask/Makefile.in b/src/tools/other/gen_vx_mask/Makefile.in index e431f5ff9d..fd9d0ba39a 100644 --- a/src/tools/other/gen_vx_mask/Makefile.in +++ b/src/tools/other/gen_vx_mask/Makefile.in @@ -213,11 +213,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -328,6 +334,7 @@ gen_vx_mask_LDADD = -lvx_shapedata \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_gis \ diff --git a/src/tools/other/gis_utils/Makefile.in b/src/tools/other/gis_utils/Makefile.in index c4ffd9e720..c43a62c46a 100644 --- a/src/tools/other/gis_utils/Makefile.in +++ b/src/tools/other/gis_utils/Makefile.in @@ -227,11 +227,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/tools/other/grid_diag/Makefile.am b/src/tools/other/grid_diag/Makefile.am index d8307b8992..ad48185c29 100644 --- a/src/tools/other/grid_diag/Makefile.am +++ b/src/tools/other/grid_diag/Makefile.am @@ -26,6 +26,7 @@ grid_diag_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/grid_diag/Makefile.in b/src/tools/other/grid_diag/Makefile.in index 9ce5481f2c..b640eab070 100644 --- a/src/tools/other/grid_diag/Makefile.in +++ b/src/tools/other/grid_diag/Makefile.in @@ -215,11 +215,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -336,6 +342,7 @@ grid_diag_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/gsi_tools/Makefile.am b/src/tools/other/gsi_tools/Makefile.am index 214e70657d..d7fec0a689 100644 --- a/src/tools/other/gsi_tools/Makefile.am +++ b/src/tools/other/gsi_tools/Makefile.am @@ -45,8 +45,9 @@ gsid2mpr_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_data2d \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ @@ -94,8 +95,9 @@ gsidens2orank_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_data2d \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/other/gsi_tools/Makefile.in b/src/tools/other/gsi_tools/Makefile.in index 218e3de140..6f9f8c2fe9 100644 --- a/src/tools/other/gsi_tools/Makefile.in +++ b/src/tools/other/gsi_tools/Makefile.in @@ -251,11 +251,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -389,8 +395,9 @@ gsid2mpr_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_data2d \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ @@ -439,8 +446,9 @@ gsidens2orank_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_data2d \ - -lvx_seeps \ + -lvx_seeps \ -lvx_nc_util \ -lvx_regrid \ -lvx_grid \ diff --git a/src/tools/other/ioda2nc/Makefile.am b/src/tools/other/ioda2nc/Makefile.am index 650b13fffb..b5cf633a54 100644 --- a/src/tools/other/ioda2nc/Makefile.am +++ b/src/tools/other/ioda2nc/Makefile.am @@ -24,6 +24,7 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/ioda2nc/Makefile.in b/src/tools/other/ioda2nc/Makefile.in index 2c23b4f74e..3e5d657e88 100644 --- a/src/tools/other/ioda2nc/Makefile.in +++ b/src/tools/other/ioda2nc/Makefile.in @@ -228,11 +228,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -347,6 +353,7 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/lidar2nc/Makefile.am b/src/tools/other/lidar2nc/Makefile.am index 5cad14876f..f13e1dac80 100644 --- a/src/tools/other/lidar2nc/Makefile.am +++ b/src/tools/other/lidar2nc/Makefile.am @@ -26,6 +26,7 @@ lidar2nc_LDADD = -lvx_shapedata \ -lvx_data2d_nc_met \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_nc_obs \ -lvx_nc_util \ diff --git a/src/tools/other/lidar2nc/Makefile.in b/src/tools/other/lidar2nc/Makefile.in index fc7814febf..9b1f62318e 100644 --- a/src/tools/other/lidar2nc/Makefile.in +++ b/src/tools/other/lidar2nc/Makefile.in @@ -228,11 +228,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -350,6 +356,7 @@ lidar2nc_LDADD = -lvx_shapedata \ -lvx_data2d_nc_met \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_nc_obs \ -lvx_nc_util \ diff --git a/src/tools/other/madis2nc/Makefile.am b/src/tools/other/madis2nc/Makefile.am index 6b1dba74fd..feb1cc0c4d 100644 --- a/src/tools/other/madis2nc/Makefile.am +++ b/src/tools/other/madis2nc/Makefile.am @@ -23,6 +23,7 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/madis2nc/Makefile.in b/src/tools/other/madis2nc/Makefile.in index 4b821f3bcf..0d35e5978a 100644 --- a/src/tools/other/madis2nc/Makefile.in +++ b/src/tools/other/madis2nc/Makefile.in @@ -216,11 +216,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -333,6 +339,7 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/mode_graphics/Makefile.am b/src/tools/other/mode_graphics/Makefile.am index adda76d68a..6773629974 100644 --- a/src/tools/other/mode_graphics/Makefile.am +++ b/src/tools/other/mode_graphics/Makefile.am @@ -26,6 +26,7 @@ plot_mode_field_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_plot_util \ -lvx_data2d_nc_met \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_grid \ diff --git a/src/tools/other/mode_graphics/Makefile.in b/src/tools/other/mode_graphics/Makefile.in index d08405212e..f0c50cee76 100644 --- a/src/tools/other/mode_graphics/Makefile.in +++ b/src/tools/other/mode_graphics/Makefile.in @@ -236,11 +236,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -356,6 +362,7 @@ plot_mode_field_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_plot_util \ -lvx_data2d_nc_met \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_grid \ diff --git a/src/tools/other/mode_time_domain/Makefile.am b/src/tools/other/mode_time_domain/Makefile.am index 2015d82293..7c6bb4392d 100644 --- a/src/tools/other/mode_time_domain/Makefile.am +++ b/src/tools/other/mode_time_domain/Makefile.am @@ -55,6 +55,7 @@ mtd_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/mode_time_domain/Makefile.in b/src/tools/other/mode_time_domain/Makefile.in index 0650adc52e..05e2c0692a 100644 --- a/src/tools/other/mode_time_domain/Makefile.in +++ b/src/tools/other/mode_time_domain/Makefile.in @@ -254,11 +254,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -405,6 +411,7 @@ mtd_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/modis_regrid/Makefile.am b/src/tools/other/modis_regrid/Makefile.am index 326cdf5870..8b16557c9c 100644 --- a/src/tools/other/modis_regrid/Makefile.am +++ b/src/tools/other/modis_regrid/Makefile.am @@ -35,6 +35,7 @@ modis_regrid_LDADD = -lvx_pxm \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_data2d \ diff --git a/src/tools/other/modis_regrid/Makefile.in b/src/tools/other/modis_regrid/Makefile.in index b72e0d8284..a7382a2588 100644 --- a/src/tools/other/modis_regrid/Makefile.in +++ b/src/tools/other/modis_regrid/Makefile.in @@ -224,11 +224,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -354,6 +360,7 @@ modis_regrid_LDADD = -lvx_pxm \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_data2d \ diff --git a/src/tools/other/pb2nc/Makefile.am b/src/tools/other/pb2nc/Makefile.am index 144d4f5ba1..9888a2e63b 100644 --- a/src/tools/other/pb2nc/Makefile.am +++ b/src/tools/other/pb2nc/Makefile.am @@ -41,6 +41,7 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/pb2nc/Makefile.in b/src/tools/other/pb2nc/Makefile.in index 8e07def80d..39b7e034af 100644 --- a/src/tools/other/pb2nc/Makefile.in +++ b/src/tools/other/pb2nc/Makefile.in @@ -244,11 +244,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -375,6 +381,7 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/plot_data_plane/Makefile.am b/src/tools/other/plot_data_plane/Makefile.am index 24b7dbc16c..8c84625e32 100644 --- a/src/tools/other/plot_data_plane/Makefile.am +++ b/src/tools/other/plot_data_plane/Makefile.am @@ -20,6 +20,7 @@ plot_data_plane_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/plot_data_plane/Makefile.in b/src/tools/other/plot_data_plane/Makefile.in index 3e5e862ffa..0b2e1cf75a 100644 --- a/src/tools/other/plot_data_plane/Makefile.in +++ b/src/tools/other/plot_data_plane/Makefile.in @@ -215,11 +215,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -329,6 +335,7 @@ plot_data_plane_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/plot_point_obs/Makefile.am b/src/tools/other/plot_point_obs/Makefile.am index f34ef23a5a..9a537321e2 100644 --- a/src/tools/other/plot_point_obs/Makefile.am +++ b/src/tools/other/plot_point_obs/Makefile.am @@ -21,6 +21,7 @@ plot_point_obs_LDADD = -lvx_statistics \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/plot_point_obs/Makefile.in b/src/tools/other/plot_point_obs/Makefile.in index c1f721ef3f..53788d19c1 100644 --- a/src/tools/other/plot_point_obs/Makefile.in +++ b/src/tools/other/plot_point_obs/Makefile.in @@ -216,11 +216,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -332,6 +338,7 @@ plot_point_obs_LDADD = -lvx_statistics \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/point2grid/Makefile.am b/src/tools/other/point2grid/Makefile.am index 3f332a9d34..805c8b2fd2 100644 --- a/src/tools/other/point2grid/Makefile.am +++ b/src/tools/other/point2grid/Makefile.am @@ -21,6 +21,7 @@ point2grid_LDADD = -lvx_statistics \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/point2grid/Makefile.in b/src/tools/other/point2grid/Makefile.in index 4d31513f8a..5c2cc881d9 100644 --- a/src/tools/other/point2grid/Makefile.in +++ b/src/tools/other/point2grid/Makefile.in @@ -228,11 +228,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -344,6 +350,7 @@ point2grid_LDADD = -lvx_statistics \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/regrid_data_plane/Makefile.am b/src/tools/other/regrid_data_plane/Makefile.am index 94cd352f65..2efd122c4f 100644 --- a/src/tools/other/regrid_data_plane/Makefile.am +++ b/src/tools/other/regrid_data_plane/Makefile.am @@ -21,6 +21,7 @@ regrid_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/regrid_data_plane/Makefile.in b/src/tools/other/regrid_data_plane/Makefile.in index 83f8c1bdd1..d565c60b98 100644 --- a/src/tools/other/regrid_data_plane/Makefile.in +++ b/src/tools/other/regrid_data_plane/Makefile.in @@ -216,11 +216,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -331,6 +337,7 @@ regrid_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/shift_data_plane/Makefile.am b/src/tools/other/shift_data_plane/Makefile.am index d97ea98b7f..fa78dbd5f9 100644 --- a/src/tools/other/shift_data_plane/Makefile.am +++ b/src/tools/other/shift_data_plane/Makefile.am @@ -21,6 +21,7 @@ shift_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/shift_data_plane/Makefile.in b/src/tools/other/shift_data_plane/Makefile.in index 11b93c7f97..1887ceb5b7 100644 --- a/src/tools/other/shift_data_plane/Makefile.in +++ b/src/tools/other/shift_data_plane/Makefile.in @@ -216,11 +216,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -331,6 +337,7 @@ shift_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/wwmca_tool/Makefile.am b/src/tools/other/wwmca_tool/Makefile.am index d8f2701165..bc3fcbce06 100644 --- a/src/tools/other/wwmca_tool/Makefile.am +++ b/src/tools/other/wwmca_tool/Makefile.am @@ -44,6 +44,7 @@ wwmca_regrid_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -90,6 +91,7 @@ wwmca_plot_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/src/tools/other/wwmca_tool/Makefile.in b/src/tools/other/wwmca_tool/Makefile.in index 13bbb9abdf..3496883d48 100644 --- a/src/tools/other/wwmca_tool/Makefile.in +++ b/src/tools/other/wwmca_tool/Makefile.in @@ -274,11 +274,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -411,6 +417,7 @@ wwmca_regrid_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -458,6 +465,7 @@ wwmca_plot_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/src/tools/tc_utils/Makefile.in b/src/tools/tc_utils/Makefile.in index 2cd4549d0f..6bc15376af 100644 --- a/src/tools/tc_utils/Makefile.in +++ b/src/tools/tc_utils/Makefile.in @@ -225,11 +225,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.am b/src/tools/tc_utils/rmw_analysis/Makefile.am index cf27759681..63e6c7a28e 100644 --- a/src/tools/tc_utils/rmw_analysis/Makefile.am +++ b/src/tools/tc_utils/rmw_analysis/Makefile.am @@ -26,6 +26,7 @@ rmw_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.in b/src/tools/tc_utils/rmw_analysis/Makefile.in index 409baa5a41..e0f6abe947 100644 --- a/src/tools/tc_utils/rmw_analysis/Makefile.in +++ b/src/tools/tc_utils/rmw_analysis/Makefile.in @@ -216,11 +216,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -337,6 +343,7 @@ rmw_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_diag/Makefile.am b/src/tools/tc_utils/tc_diag/Makefile.am index a877795dca..20b10b2711 100644 --- a/src/tools/tc_utils/tc_diag/Makefile.am +++ b/src/tools/tc_utils/tc_diag/Makefile.am @@ -27,6 +27,7 @@ tc_diag_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_diag/Makefile.in b/src/tools/tc_utils/tc_diag/Makefile.in index 67b37ca03f..ab237104e5 100644 --- a/src/tools/tc_utils/tc_diag/Makefile.in +++ b/src/tools/tc_utils/tc_diag/Makefile.in @@ -218,11 +218,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -340,6 +346,7 @@ tc_diag_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_dland/Makefile.am b/src/tools/tc_utils/tc_dland/Makefile.am index 2321150cf8..47af10b1c0 100644 --- a/src/tools/tc_utils/tc_dland/Makefile.am +++ b/src/tools/tc_utils/tc_dland/Makefile.am @@ -16,6 +16,7 @@ tc_dland_SOURCES = tc_dland.cc \ tc_dland_CPPFLAGS = ${MET_CPPFLAGS} tc_dland_LDFLAGS = ${MET_LDFLAGS} tc_dland_LDADD = -lvx_tc_util \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_nc_util \ -lvx_grid \ -lvx_geodesy \ diff --git a/src/tools/tc_utils/tc_dland/Makefile.in b/src/tools/tc_utils/tc_dland/Makefile.in index c413bf9e16..1fff6ed87c 100644 --- a/src/tools/tc_utils/tc_dland/Makefile.in +++ b/src/tools/tc_utils/tc_dland/Makefile.in @@ -227,11 +227,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -338,6 +344,7 @@ tc_dland_SOURCES = tc_dland.cc \ tc_dland_CPPFLAGS = ${MET_CPPFLAGS} tc_dland_LDFLAGS = ${MET_LDFLAGS} tc_dland_LDADD = -lvx_tc_util \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_nc_util \ -lvx_grid \ -lvx_geodesy \ diff --git a/src/tools/tc_utils/tc_gen/Makefile.am b/src/tools/tc_utils/tc_gen/Makefile.am index 61797a8c5d..5ca6353aee 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.am +++ b/src/tools/tc_utils/tc_gen/Makefile.am @@ -27,6 +27,7 @@ tc_gen_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_gis \ -lvx_data2d \ diff --git a/src/tools/tc_utils/tc_gen/Makefile.in b/src/tools/tc_utils/tc_gen/Makefile.in index 8490e3f8a5..69e77e4aeb 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.in +++ b/src/tools/tc_utils/tc_gen/Makefile.in @@ -216,11 +216,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -338,6 +344,7 @@ tc_gen_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_gis \ -lvx_data2d \ diff --git a/src/tools/tc_utils/tc_pairs/Makefile.am b/src/tools/tc_utils/tc_pairs/Makefile.am index 6ee78dcd75..6626964a6c 100644 --- a/src/tools/tc_utils/tc_pairs/Makefile.am +++ b/src/tools/tc_utils/tc_pairs/Makefile.am @@ -29,6 +29,7 @@ tc_pairs_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_pairs/Makefile.in b/src/tools/tc_utils/tc_pairs/Makefile.in index 4c12ea4532..faf8501eb9 100644 --- a/src/tools/tc_utils/tc_pairs/Makefile.in +++ b/src/tools/tc_utils/tc_pairs/Makefile.in @@ -240,11 +240,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -364,6 +370,7 @@ tc_pairs_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_rmw/Makefile.am b/src/tools/tc_utils/tc_rmw/Makefile.am index ae3485a3eb..12676b3430 100644 --- a/src/tools/tc_utils/tc_rmw/Makefile.am +++ b/src/tools/tc_utils/tc_rmw/Makefile.am @@ -27,6 +27,7 @@ tc_rmw_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_rmw/Makefile.in b/src/tools/tc_utils/tc_rmw/Makefile.in index 0bb8949b79..43bf8353df 100644 --- a/src/tools/tc_utils/tc_rmw/Makefile.in +++ b/src/tools/tc_utils/tc_rmw/Makefile.in @@ -218,11 +218,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -340,6 +346,7 @@ tc_rmw_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_stat/Makefile.am b/src/tools/tc_utils/tc_stat/Makefile.am index ffe30bc36c..e668d0feb7 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.am +++ b/src/tools/tc_utils/tc_stat/Makefile.am @@ -29,6 +29,7 @@ tc_stat_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/tc_utils/tc_stat/Makefile.in b/src/tools/tc_utils/tc_stat/Makefile.in index f6ab37bcc8..ae8ecd44b2 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.in +++ b/src/tools/tc_utils/tc_stat/Makefile.in @@ -218,11 +218,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -342,6 +348,7 @@ tc_stat_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ + -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ From a8cc6e5d579fbab164cf8527e5f8cdf490b089e6 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 12 Sep 2023 16:04:53 -0600 Subject: [PATCH 016/109] #2231 Added vx_data2d_ugrid to AC_CONFIG_FILES --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 2dada7903b..7d5d7fef6c 100644 --- a/configure.ac +++ b/configure.ac @@ -1268,6 +1268,7 @@ AC_CONFIG_FILES([Makefile src/libcode/vx_data2d_nc_met/Makefile src/libcode/vx_data2d_nc_pinterp/Makefile src/libcode/vx_data2d_nccf/Makefile + src/libcode/vx_data2d_ugrid/Makefile src/libcode/vx_geodesy/Makefile src/libcode/vx_gis/Makefile src/libcode/vx_gnomon/Makefile From e0a648f871f47881495d228c3247b71bafc650ae Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 12 Sep 2023 16:05:23 -0600 Subject: [PATCH 017/109] #2231 Corrected comments --- src/libcode/vx_nc_util/nc_utils.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcode/vx_nc_util/nc_utils.cc b/src/libcode/vx_nc_util/nc_utils.cc index 734f87fe7b..6464a92ef9 100644 --- a/src/libcode/vx_nc_util/nc_utils.cc +++ b/src/libcode/vx_nc_util/nc_utils.cc @@ -3611,7 +3611,7 @@ void parse_time_string(const char *str, unixtime &ut) { } else { // Tokenize the input string - // Parse using spaces or 'T' for timestrings such as: + // Parse using spaces, '_', or 'T' for timestrings such as: // 2016-01-28T12:00:00Z // 1977-08-07 12:00:00Z StringArray tok; From 4331688bfdf0ef401b664a1d9369851943321d0e Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Mon, 18 Sep 2023 15:07:40 -0600 Subject: [PATCH 018/109] #2231 Added src/libcode/vx_data2d_ugrid/Makefile --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index b5bd75ff38..904c15c4f1 100755 --- a/configure +++ b/configure @@ -8951,7 +8951,7 @@ done # Create configured files -ac_config_files="$ac_config_files Makefile scripts/Rscripts/Makefile scripts/Rscripts/include/Makefile scripts/python/Makefile scripts/python/examples/Makefile scripts/python/met/Makefile scripts/python/pyembed/Makefile scripts/python/utility/Makefile scripts/python/tc_diag/Makefile data/Makefile data/climo/Makefile data/climo/seeps/Makefile data/colortables/Makefile data/colortables/NCL_colortables/Makefile data/config/Makefile data/map/Makefile data/map/admin_by_country/Makefile data/poly/Makefile data/poly/HMT_masks/Makefile data/poly/NCEP_masks/Makefile data/ps/Makefile data/table_files/Makefile data/tc_data/Makefile src/Makefile src/basic/Makefile src/basic/enum_to_string/Makefile src/basic/vx_cal/Makefile src/basic/vx_config/Makefile src/basic/vx_log/Makefile src/basic/vx_math/Makefile src/basic/vx_util/Makefile src/basic/vx_util_math/Makefile src/libcode/Makefile src/libcode/vx_afm/Makefile src/libcode/vx_analysis_util/Makefile src/libcode/vx_color/Makefile src/libcode/vx_data2d/Makefile src/libcode/vx_data2d_factory/Makefile src/libcode/vx_data2d_grib/Makefile src/libcode/vx_data2d_grib2/Makefile src/libcode/vx_data2d_nc_met/Makefile src/libcode/vx_data2d_nc_pinterp/Makefile src/libcode/vx_data2d_nccf/Makefile src/libcode/vx_geodesy/Makefile src/libcode/vx_gis/Makefile src/libcode/vx_gnomon/Makefile src/libcode/vx_grid/Makefile src/libcode/vx_gsl_prob/Makefile src/libcode/vx_nav/Makefile src/libcode/vx_solar/Makefile src/libcode/vx_nc_obs/Makefile src/libcode/vx_nc_util/Makefile src/libcode/vx_pb_util/Makefile src/libcode/vx_plot_util/Makefile src/libcode/vx_ps/Makefile src/libcode/vx_pxm/Makefile src/libcode/vx_render/Makefile src/libcode/vx_shapedata/Makefile src/libcode/vx_stat_out/Makefile src/libcode/vx_statistics/Makefile src/libcode/vx_time_series/Makefile src/libcode/vx_physics/Makefile src/libcode/vx_series_data/Makefile src/libcode/vx_regrid/Makefile src/libcode/vx_tc_util/Makefile src/libcode/vx_summary/Makefile src/libcode/vx_python3_utils/Makefile src/libcode/vx_data2d_python/Makefile src/libcode/vx_bool_calc/Makefile src/libcode/vx_pointdata_python/Makefile src/libcode/vx_seeps/Makefile src/tools/Makefile src/tools/core/Makefile src/tools/core/ensemble_stat/Makefile src/tools/core/grid_stat/Makefile src/tools/core/mode/Makefile src/tools/core/mode_analysis/Makefile src/tools/core/pcp_combine/Makefile src/tools/core/point_stat/Makefile src/tools/core/series_analysis/Makefile src/tools/core/stat_analysis/Makefile src/tools/core/wavelet_stat/Makefile src/tools/other/Makefile src/tools/other/ascii2nc/Makefile src/tools/other/lidar2nc/Makefile src/tools/other/gen_ens_prod/Makefile src/tools/other/gen_vx_mask/Makefile src/tools/other/gis_utils/Makefile src/tools/other/ioda2nc/Makefile src/tools/other/madis2nc/Makefile src/tools/other/mode_graphics/Makefile src/tools/other/modis_regrid/Makefile src/tools/other/pb2nc/Makefile src/tools/other/plot_data_plane/Makefile src/tools/other/plot_point_obs/Makefile src/tools/other/wwmca_tool/Makefile src/tools/other/gsi_tools/Makefile src/tools/other/regrid_data_plane/Makefile src/tools/other/point2grid/Makefile src/tools/other/shift_data_plane/Makefile src/tools/other/mode_time_domain/Makefile src/tools/other/grid_diag/Makefile src/tools/tc_utils/Makefile src/tools/tc_utils/tc_dland/Makefile src/tools/tc_utils/tc_pairs/Makefile src/tools/tc_utils/tc_stat/Makefile src/tools/tc_utils/tc_gen/Makefile src/tools/tc_utils/rmw_analysis/Makefile src/tools/tc_utils/tc_rmw/Makefile src/tools/tc_utils/tc_diag/Makefile" +ac_config_files="$ac_config_files Makefile scripts/Rscripts/Makefile scripts/Rscripts/include/Makefile scripts/python/Makefile scripts/python/examples/Makefile scripts/python/met/Makefile scripts/python/pyembed/Makefile scripts/python/utility/Makefile scripts/python/tc_diag/Makefile data/Makefile data/climo/Makefile data/climo/seeps/Makefile data/colortables/Makefile data/colortables/NCL_colortables/Makefile data/config/Makefile data/map/Makefile data/map/admin_by_country/Makefile data/poly/Makefile data/poly/HMT_masks/Makefile data/poly/NCEP_masks/Makefile data/ps/Makefile data/table_files/Makefile data/tc_data/Makefile src/Makefile src/basic/Makefile src/basic/enum_to_string/Makefile src/basic/vx_cal/Makefile src/basic/vx_config/Makefile src/basic/vx_log/Makefile src/basic/vx_math/Makefile src/basic/vx_util/Makefile src/basic/vx_util_math/Makefile src/libcode/Makefile src/libcode/vx_afm/Makefile src/libcode/vx_analysis_util/Makefile src/libcode/vx_color/Makefile src/libcode/vx_data2d/Makefile src/libcode/vx_data2d_factory/Makefile src/libcode/vx_data2d_grib/Makefile src/libcode/vx_data2d_grib2/Makefile src/libcode/vx_data2d_nc_met/Makefile src/libcode/vx_data2d_nc_pinterp/Makefile src/libcode/vx_data2d_nccf/Makefile src/libcode/vx_data2d_ugrid/Makefile src/libcode/vx_geodesy/Makefile src/libcode/vx_gis/Makefile src/libcode/vx_gnomon/Makefile src/libcode/vx_grid/Makefile src/libcode/vx_gsl_prob/Makefile src/libcode/vx_nav/Makefile src/libcode/vx_solar/Makefile src/libcode/vx_nc_obs/Makefile src/libcode/vx_nc_util/Makefile src/libcode/vx_pb_util/Makefile src/libcode/vx_plot_util/Makefile src/libcode/vx_ps/Makefile src/libcode/vx_pxm/Makefile src/libcode/vx_render/Makefile src/libcode/vx_shapedata/Makefile src/libcode/vx_stat_out/Makefile src/libcode/vx_statistics/Makefile src/libcode/vx_time_series/Makefile src/libcode/vx_physics/Makefile src/libcode/vx_series_data/Makefile src/libcode/vx_regrid/Makefile src/libcode/vx_tc_util/Makefile src/libcode/vx_summary/Makefile src/libcode/vx_python3_utils/Makefile src/libcode/vx_data2d_python/Makefile src/libcode/vx_bool_calc/Makefile src/libcode/vx_pointdata_python/Makefile src/libcode/vx_seeps/Makefile src/tools/Makefile src/tools/core/Makefile src/tools/core/ensemble_stat/Makefile src/tools/core/grid_stat/Makefile src/tools/core/mode/Makefile src/tools/core/mode_analysis/Makefile src/tools/core/pcp_combine/Makefile src/tools/core/point_stat/Makefile src/tools/core/series_analysis/Makefile src/tools/core/stat_analysis/Makefile src/tools/core/wavelet_stat/Makefile src/tools/other/Makefile src/tools/other/ascii2nc/Makefile src/tools/other/lidar2nc/Makefile src/tools/other/gen_ens_prod/Makefile src/tools/other/gen_vx_mask/Makefile src/tools/other/gis_utils/Makefile src/tools/other/ioda2nc/Makefile src/tools/other/madis2nc/Makefile src/tools/other/mode_graphics/Makefile src/tools/other/modis_regrid/Makefile src/tools/other/pb2nc/Makefile src/tools/other/plot_data_plane/Makefile src/tools/other/plot_point_obs/Makefile src/tools/other/wwmca_tool/Makefile src/tools/other/gsi_tools/Makefile src/tools/other/regrid_data_plane/Makefile src/tools/other/point2grid/Makefile src/tools/other/shift_data_plane/Makefile src/tools/other/mode_time_domain/Makefile src/tools/other/grid_diag/Makefile src/tools/tc_utils/Makefile src/tools/tc_utils/tc_dland/Makefile src/tools/tc_utils/tc_pairs/Makefile src/tools/tc_utils/tc_stat/Makefile src/tools/tc_utils/tc_gen/Makefile src/tools/tc_utils/rmw_analysis/Makefile src/tools/tc_utils/tc_rmw/Makefile src/tools/tc_utils/tc_diag/Makefile" if test -n "$MET_DEVELOPMENT"; then @@ -9878,6 +9878,7 @@ do "src/libcode/vx_data2d_nc_met/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcode/vx_data2d_nc_met/Makefile" ;; "src/libcode/vx_data2d_nc_pinterp/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcode/vx_data2d_nc_pinterp/Makefile" ;; "src/libcode/vx_data2d_nccf/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcode/vx_data2d_nccf/Makefile" ;; + "src/libcode/vx_data2d_ugrid/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcode/vx_data2d_ugrid/Makefile" ;; "src/libcode/vx_geodesy/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcode/vx_geodesy/Makefile" ;; "src/libcode/vx_gis/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcode/vx_gis/Makefile" ;; "src/libcode/vx_gnomon/Makefile") CONFIG_FILES="$CONFIG_FILES src/libcode/vx_gnomon/Makefile" ;; From 6ded51e65ebbb7b6d86301b30706bc1c55eac024 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Mon, 18 Sep 2023 15:09:18 -0600 Subject: [PATCH 019/109] #2231 Added NETCDF_UGRID --- data/config/ConfigConstants | 1 + src/basic/vx_config/config_constants.h | 4 +++ src/basic/vx_config/config_util.cc | 40 ++++++++++++++++++++++++++ src/basic/vx_config/config_util.h | 3 ++ 4 files changed, 48 insertions(+) diff --git a/data/config/ConfigConstants b/data/config/ConfigConstants index c28b13ec28..b9cf21a67a 100644 --- a/data/config/ConfigConstants +++ b/data/config/ConfigConstants @@ -64,6 +64,7 @@ NETCDF_PINT = 4; NETCDF_NCCF = 5; PYTHON_NUMPY = 6; PYTHON_XARRAY = 7; +NETCDF_UGRID = 8; // Set Logic NONE = 1; diff --git a/src/basic/vx_config/config_constants.h b/src/basic/vx_config/config_constants.h index 34da078eb1..03acebbd98 100644 --- a/src/basic/vx_config/config_constants.h +++ b/src/basic/vx_config/config_constants.h @@ -675,11 +675,14 @@ static const char conf_key_trunc_factor[] = "gaussian_trunc_factor"; static const char conf_key_eclv_points[] = "eclv_points"; static const char conf_key_var_name_map[] = "var_name_map"; static const char conf_key_metadata_map[] = "metadata_map"; +static const char conf_key_ugrid_map_config[] = "ugrid_map_config"; +static const char conf_key_ugrid_metadata_map[]= "ugrid_metadata_map"; static const char conf_key_obs_to_qc_map[] = "obs_to_qc_map"; static const char conf_key_missing_thresh[] = "missing_thresh"; static const char conf_key_control_id[] = "control_id"; static const char conf_key_ens_member_ids[] = "ens_member_ids"; static const char conf_key_seeps_p1_thresh[] = "seeps_p1_thresh"; +static const char conf_key_ugrid_metadata_file[] = "ugrid_metadata_file"; // // Entries to override file metadata @@ -1229,6 +1232,7 @@ static const char conf_val_grib2 [] = "GRIB2"; static const char conf_val_netcdf_met [] = "NETCDF_MET"; static const char conf_val_netcdf_pint [] = "NETCDF_PINT"; static const char conf_val_netcdf_nccf [] = "NETCDF_NCCF"; +static const char conf_val_netcdf_ugrid [] = "NETCDF_UGRID"; static const char conf_val_python_numpy [] = "PYTHON_NUMPY"; static const char conf_val_python_xarray [] = "PYTHON_XARRAY"; diff --git a/src/basic/vx_config/config_util.cc b/src/basic/vx_config/config_util.cc index 0fae12e991..9985a22338 100644 --- a/src/basic/vx_config/config_util.cc +++ b/src/basic/vx_config/config_util.cc @@ -356,6 +356,7 @@ GrdFileType parse_conf_file_type(Dictionary *dict) { else if(v == conf_const.lookup_int(conf_val_netcdf_met)) t = FileType_NcMet; else if(v == conf_const.lookup_int(conf_val_netcdf_pint)) t = FileType_NcPinterp; else if(v == conf_const.lookup_int(conf_val_netcdf_nccf)) t = FileType_NcCF; + else if(v == conf_const.lookup_int(conf_val_netcdf_ugrid)) t = FileType_UGrid; else if(v == conf_const.lookup_int(conf_val_python_numpy)) t = FileType_Python_Numpy; else if(v == conf_const.lookup_int(conf_val_python_xarray)) t = FileType_Python_Xarray; else { @@ -1125,6 +1126,13 @@ map parse_conf_metadata_map(Dictionary *dict) { /////////////////////////////////////////////////////////////////////////////// +map parse_conf_ugrid_metadata_map(Dictionary *dict) { + const char *method_name = "parse_conf_ugrid_metadata_map() -> "; + return parse_conf_key_values_map(dict, conf_key_ugrid_metadata_map, method_name); +} + +/////////////////////////////////////////////////////////////////////////////// + map parse_conf_obs_name_map(Dictionary *dict) { const char *method_name = "parse_conf_obs_name_map() -> "; return parse_conf_key_value_map(dict, conf_key_obs_name_map); @@ -2261,6 +2269,38 @@ WaveletType parse_conf_wavelet_type(Dictionary *dict) { /////////////////////////////////////////////////////////////////////////////// +ConcatString parse_conf_ugrid_map_config(Dictionary *dict) { + ConcatString s; + + if(!dict) { + mlog << Error << "\nparse_conf_ugrid_map_config() -> " + << "empty dictionary!\n\n"; + exit(1); + } + + s = dict->lookup_string(conf_key_ugrid_map_config); + + return s; +} + +/////////////////////////////////////////////////////////////////////////////// + +ConcatString parse_conf_ugrid_metadata_file(Dictionary *dict) { + ConcatString s; + + if(!dict) { + mlog << Error << "\nparse_conf_ugrid_metadata_file() -> " + << "empty dictionary!\n\n"; + exit(1); + } + + s = dict->lookup_string(conf_key_ugrid_metadata_file); + + return s; +} + +/////////////////////////////////////////////////////////////////////////////// + void PlotInfo::clear() { flag = true; // enabled by default diff --git a/src/basic/vx_config/config_util.h b/src/basic/vx_config/config_util.h index e31f4eb81e..a52335988b 100644 --- a/src/basic/vx_config/config_util.h +++ b/src/basic/vx_config/config_util.h @@ -64,6 +64,7 @@ extern std::map parse_conf_obs_name_map(Dictionary *dict); extern std::map parse_conf_obs_to_qc_map(Dictionary *dict); +extern std::map parse_conf_ugrid_metadata_map(Dictionary *dict); extern std::map parse_conf_key_convert_map( Dictionary *dict, const char *conf_key_map_name, const char *caller=nullptr); @@ -85,6 +86,8 @@ extern void parse_conf_range_int(Dictionary *dict, int &beg, int &end extern void parse_conf_range_double(Dictionary *dict, double &beg, double &end); extern StringArray parse_conf_ens_member_ids(Dictionary *dict); extern NormalizeType parse_conf_normalize(Dictionary *dict); +extern ConcatString parse_conf_ugrid_map_config(Dictionary *dict); +extern ConcatString parse_conf_ugrid_metadata_file(Dictionary *dict); extern void check_mask_names(const StringArray &); From f5b76fd7b305f003fbd775fc252f19ca43ca6f38 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Mon, 18 Sep 2023 15:10:43 -0600 Subject: [PATCH 020/109] #2231 Added MET_ATLAS and MET_ECKIT --- src/libcode/vx_data2d_ugrid/Makefile.in | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/libcode/vx_data2d_ugrid/Makefile.in b/src/libcode/vx_data2d_ugrid/Makefile.in index 4a5123003e..8ed3146c4b 100644 --- a/src/libcode/vx_data2d_ugrid/Makefile.in +++ b/src/libcode/vx_data2d_ugrid/Makefile.in @@ -233,11 +233,17 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ +MET_ATLAS = @MET_ATLAS@ +MET_ATLASINC = @MET_ATLASINC@ +MET_ATLASLIB = @MET_ATLASLIB@ MET_BUFR = @MET_BUFR@ MET_BUFRLIB = @MET_BUFRLIB@ MET_CAIRO = @MET_CAIRO@ MET_CAIROINC = @MET_CAIROINC@ MET_CAIROLIB = @MET_CAIROLIB@ +MET_ECKIT = @MET_ECKIT@ +MET_ECKITINC = @MET_ECKITINC@ +MET_ECKITLIB = @MET_ECKITLIB@ MET_FREETYPE = @MET_FREETYPE@ MET_FREETYPEINC = @MET_FREETYPEINC@ MET_FREETYPELIB = @MET_FREETYPELIB@ @@ -259,6 +265,9 @@ MET_HDFLIB = @MET_HDFLIB@ MET_NETCDF = @MET_NETCDF@ MET_NETCDFINC = @MET_NETCDFINC@ MET_NETCDFLIB = @MET_NETCDFLIB@ +MET_PROJ = @MET_PROJ@ +MET_PROJINC = @MET_PROJINC@ +MET_PROJLIB = @MET_PROJLIB@ MET_PYTHON_BIN_EXE = @MET_PYTHON_BIN_EXE@ MET_PYTHON_CC = @MET_PYTHON_CC@ MET_PYTHON_LD = @MET_PYTHON_LD@ @@ -344,7 +353,7 @@ libvx_data2d_ugrid_a_SOURCES = \ data2d_ugrid.cc data2d_ugrid.h \ vx_data2d_ugrid.h -libvx_data2d_ugrid_a_CPPFLAGS = ${MET_CPPFLAGS} -I/d1/personal/hsoh/third_party/install/atlas/include -I/d1/personal/hsoh/third_party/install/eckit/include +libvx_data2d_ugrid_a_CPPFLAGS = ${MET_CPPFLAGS} all: all-am .SUFFIXES: From 0218ae2fcb99600ae1cb70c010858557657303cc Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Mon, 18 Sep 2023 15:15:19 -0600 Subject: [PATCH 021/109] #2231 Added checksum for unstructured grid --- src/libcode/vx_grid/grid_base.cc | 38 +++++++++--------- src/libcode/vx_grid/unstructured_grid.cc | 41 ++++++++++++++------ src/libcode/vx_grid/unstructured_grid.h | 4 +- src/libcode/vx_grid/unstructured_grid_defs.h | 3 ++ 4 files changed, 54 insertions(+), 32 deletions(-) diff --git a/src/libcode/vx_grid/grid_base.cc b/src/libcode/vx_grid/grid_base.cc index 7103f8da6c..8827423321 100644 --- a/src/libcode/vx_grid/grid_base.cc +++ b/src/libcode/vx_grid/grid_base.cc @@ -309,6 +309,9 @@ void UnstructuredData::clear() { name = (const char *) nullptr; Nface = 0; + //distance = -1.; // disable distance + lat_checksum = lon_checksum = 0.; + pointLonLat.clear(); if (kdtree) { delete kdtree; kdtree = nullptr; } @@ -322,11 +325,10 @@ void UnstructuredData::dump() const { mlog << Debug(grid_debug_level) << "\nUnstructured Grid Data:\n" -// << " lats: " << lats.summarize() << "\n" -// << " lons: " << lons.summarize() << "\n" -// << " levels: " << levels.summarize() << "\n" -// << " times: " << times.summarize() << "\n\n"; - ; + << " Nface: " << Nface << "\n" + << " lat_checksum: " << lat_checksum << "\n" + << " lon_checksum: " << lon_checksum << "\n" + ; } @@ -1663,21 +1665,17 @@ bool is_eq(const UnstructuredData * us1, const UnstructuredData * us2) { -if ( !us1 || !us2 ) return false; - -bool status = false; - - -cout << " CORRECT ME !!! grid_base.cc: is_eq(const UnstructuredData * us1, const UnstructuredData * us2)\n"; - -if ( us1->Nface == us2->Nface && - us1->Nnode == us2->Nnode && - us1->Nedge == us2->Nedge && - us1->pointLonLat[0] == us2->pointLonLat[0] ) { - if (us1->Nface > 0 && us1->pointLonLat[us1->Nface-1] == us2->pointLonLat[us2->Nface-1]) status = true; -} - -cout << " CORRECT ME !!! grid_base.cc: is_eq(const UnstructuredData * us1, const UnstructuredData * us2) status=" << status << "\n"; + bool status = false; + if (us1 && us2) { + if (us1 == us2) status = true; + else status = us1->Nface == us2->Nface + && us1->Nnode == us2->Nnode + && us1->Nedge == us2->Nedge + && us1->pointLonLat[0] == us2->pointLonLat[0] + && (us1->Nface > 0 && us1->pointLonLat[us1->Nface-1] == us2->pointLonLat[us2->Nface-1]) + && is_eq(us1->lat_checksum, us2->lat_checksum) + && is_eq(us1->lon_checksum, us2->lon_checksum); + } return status; diff --git a/src/libcode/vx_grid/unstructured_grid.cc b/src/libcode/vx_grid/unstructured_grid.cc index 279718ed86..03d9e9b0c7 100644 --- a/src/libcode/vx_grid/unstructured_grid.cc +++ b/src/libcode/vx_grid/unstructured_grid.cc @@ -34,6 +34,7 @@ using IndexKDTree = atlas::util::IndexKDTree; //////////////////////////////////////////////////////////////////////// +static const int UGRID_DEBUG_LEVEL = 9; static atlas::Geometry atlas_geometry; @@ -70,6 +71,7 @@ void UnstructuredGrid::clear() { Nx = 0; wrapLon = false; + //pt_distance = -1.; // Disabled Data.clear(); return; @@ -91,7 +93,7 @@ UnstructuredGrid::UnstructuredGrid(const UnstructuredData & data) { void UnstructuredGrid::set_from_data(const UnstructuredData &data) { - Data.clear(); + clear(); if (data.name) Name = data.name; Nx = data.Nface;; @@ -99,10 +101,17 @@ void UnstructuredGrid::set_from_data(const UnstructuredData &data) { Data.Nface = Nx; Data.Nedge = data.Nedge; Data.Nnode = data.Nnode; + Data.pt_distance = data.pt_distance; Data.set_points(Nx, data.pointLonLat); - return; +} + +//////////////////////////////////////////////////////////////////////// + +void UnstructuredGrid::set_distance(double _distance) { + + Data.pt_distance = _distance; } @@ -112,15 +121,22 @@ void UnstructuredGrid::set_from_data(const UnstructuredData &data) { void UnstructuredGrid::latlon_to_xy(double lat, double lon, double &x, double &y) const { PointLonLat _pointLonLat(lon, lat); - y = 0; IndexKDTree::ValueList neighbor = Data.kdtree->closestPoints(_pointLonLat, 1); size_t index(neighbor[0].payload()); + double distance(neighbor[0].distance()); + x = index; + y = 0; - mlog << Debug(7) << "UnstructuredGrid::latlon_to_xy() " - << "(" << lon << ", " << lat << ") ==> (" << x << ", " << y << ")\n"; + PointLonLat lonlat; + if(distance > 180.0) atlas_geometry.xyz2lonlat(neighbor[0].point(), lonlat); + else lonlat.assign(neighbor[0].point()[0], neighbor[0].point()[1]); + mlog << Debug(UGRID_DEBUG_LEVEL) << "UnstructuredGrid::latlon_to_xy() " + << "input=(" << lon << ", " << lat << ") ==> (" << x << ", " << y + << ") mapped (" << Data.pointLonLat[index].y() << ", " << Data.pointLonLat[index].y() + << ") distance= " << distance << "\n"; } @@ -132,7 +148,7 @@ void UnstructuredGrid::xy_to_latlon(double x, double y, double &lat, double &lon lat = Data.pointLonLat[x].y(); lon = Data.pointLonLat[x].x(); - mlog << Debug(7) << "UnstructuredGrid::xy_to_latlon() " + mlog << Debug(UGRID_DEBUG_LEVEL) << "UnstructuredGrid::xy_to_latlon() " << "(" << x << ", " << y << ") ==> (" << lon << ", " << lat << ").\n"; } @@ -317,6 +333,7 @@ void Grid::set(const UnstructuredData &data) { UnstructuredData::UnstructuredData() { kdtree = nullptr; + pt_distance = -1.; // disable distance clear(); } @@ -336,6 +353,8 @@ void UnstructuredData::build_tree() { PointLonLat pointLL(pointLonLat[i].x(), pointLonLat[i].y()); pointLL.normalise(); kdtree->insert(pointLL, n++); + lat_checksum += (i+1) * pointLonLat[i].y(); + lon_checksum += (i+1) * pointLonLat[i].x(); } kdtree->build(); @@ -349,12 +368,12 @@ void UnstructuredData::set_points(int count, double *_lon, double *_lat) { clear(); Nface = count; - pointLonLat.reserve(Nface); + pointLonLat.reserve(count); for (int i=0; i &_po for (int i=0; i &) (" - << pointLonLat[0].x() << ", " << pointLonLat[0].y() << ") and (" + mlog << Debug(UGRID_DEBUG_LEVEL) << "UnstructuredData::set_points(std::vector &) first: (" + << pointLonLat[0].x() << ", " << pointLonLat[0].y() << ") and last (" << pointLonLat[count-1].x() << ", " << pointLonLat[count-1].y() << ") from (" << _pointLonLat[0].x() << ", " << _pointLonLat[0].y() << ") and (" << _pointLonLat[count-1].x() << ", " << _pointLonLat[count-1].y() << ")\n"; diff --git a/src/libcode/vx_grid/unstructured_grid.h b/src/libcode/vx_grid/unstructured_grid.h index bf377b1d13..e850c03ea5 100644 --- a/src/libcode/vx_grid/unstructured_grid.h +++ b/src/libcode/vx_grid/unstructured_grid.h @@ -35,7 +35,8 @@ class UnstructuredGrid : public GridRep { int Nx; - + //double distance; //in meters. Set the negative distance to disbale disathce capability + bool wrapLon; @@ -46,6 +47,7 @@ class UnstructuredGrid : public GridRep { void clear(); void set_from_data(const UnstructuredData &); + void set_distance(double _distance); // // grid interface diff --git a/src/libcode/vx_grid/unstructured_grid_defs.h b/src/libcode/vx_grid/unstructured_grid_defs.h index b95d5df001..fd31bf5a7f 100644 --- a/src/libcode/vx_grid/unstructured_grid_defs.h +++ b/src/libcode/vx_grid/unstructured_grid_defs.h @@ -39,6 +39,9 @@ struct UnstructuredData { int Nface; int Nedge; int Nnode; + double pt_distance; + double lat_checksum; + double lon_checksum; std::vector pointLonLat; atlas::util::IndexKDTree *kdtree; From 8818d62df766dd5211cfbf3d7a9de89ad2f013a2 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Mon, 18 Sep 2023 15:17:56 -0600 Subject: [PATCH 022/109] #2231 Renamed to metadata_map to ugrid_metadata_map. Allow to override ugrid_metadata_map --- data/config/UGridConfig_default | 6 +- src/libcode/vx_data2d_ugrid/data2d_ugrid.cc | 45 +-- src/libcode/vx_data2d_ugrid/data2d_ugrid.h | 1 + src/libcode/vx_data2d_ugrid/ugrid_file.cc | 193 ++++++----- src/libcode/vx_data2d_ugrid/ugrid_file.h | 6 +- src/libcode/vx_data2d_ugrid/var_info_ugrid.cc | 328 +++++++++--------- src/libcode/vx_data2d_ugrid/var_info_ugrid.h | 2 +- 7 files changed, 290 insertions(+), 291 deletions(-) diff --git a/data/config/UGridConfig_default b/data/config/UGridConfig_default index 0fd8b355c7..27f5133570 100644 --- a/data/config/UGridConfig_default +++ b/data/config/UGridConfig_default @@ -2,14 +2,16 @@ // // Unstructured Grid configuration file. // -// For additional information, please see the MET User's Guide. +// UGridConfig_user at the current working directory overrides the default. +// For additional or updated information, please see the MET User's Guide. // //////////////////////////////////////////////////////////////////////////////// // // Default mapping for Metadata. +// The first values are for MPAS and the second values are for LFric. // -metadata_map = [ +ugrid_metadata_map = [ { key = "dim_face"; val = "nCells,nMesh2d_face"; }, { key = "dim_node"; val = "nVertices,nMesh2d_node"; }, { key = "dim_edge"; val = "nEdges,nMesh2d_edge"; }, diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc index 3a1582d0e6..f4d842e213 100644 --- a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc @@ -85,27 +85,6 @@ void MetUGridDataFile::ugrid_init_from_scratch() { return; } -//////////////////////////////////////////////////////////////////////// -/* -NcVarInfo *MetUGridDataFile::find_first_data_var() { - NcVarInfo *first_data_var = nullptr; - // Store the name of the first data variable - for (int i = 0; i < _file->Nvars; ++i) { - if (is_nc_unit_time(_file->Var[i].units_att.c_str()) || - is_nc_unit_longitude(_file->Var[i].units_att.c_str()) || - is_nc_unit_latitude(_file->Var[i].units_att.c_str()) || - _file->get_time_var_info() == &_file->Var[i] - ) continue; - - if (strcmp(_file->Var[i].name.c_str(), ugrid_lat_var_name) != 0 && - strcmp(_file->Var[i].name.c_str(), ugrid_lon_var_name) != 0) { - first_data_var = &(_file->Var[i]); - break; - } - } - return first_data_var; -} -*/ //////////////////////////////////////////////////////////////////////// void MetUGridDataFile::close() { @@ -211,7 +190,7 @@ cout << " FIXME MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane) LongArray dimension = vinfo_nc->dimension(); BoolArray is_offset = vinfo_nc->is_offset(); - data_var = _file->find_var_name(vinfo_nc->req_name().c_str()); + data_var = _file->find_by_name(vinfo_nc->req_name().c_str()); /* if (nullptr != data_var) { time_dim_slot = data_var->t_slot; @@ -361,7 +340,7 @@ cout << " FIXME MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane) //////////////////////////////////////////////////////////////////////// int MetUGridDataFile::data_plane_array(VarInfo &vinfo, - DataPlaneArray &plane_array) { + DataPlaneArray &plane_array) { int n_rec = 0; DataPlane plane; bool status = false; @@ -371,14 +350,6 @@ int MetUGridDataFile::data_plane_array(VarInfo &vinfo, // Initialize plane_array.clear(); - VarInfoUGrid *vinfo_nc = (VarInfoUGrid *)&vinfo; - if ( vinfo_nc->req_name() == na_str ) { - // Store the name of the first data variable -cout << " FIXME MetUGridDataFile::data_plane_array() calling find_first_data_var()\n"; -// NcVarInfo *data_var = find_first_data_var(); -// if (nullptr != data_var) vinfo_nc->set_req_name(data_var->name.c_str()); - } - LongArray time_offsets = collect_time_offsets(vinfo); if (0 < time_offsets.n_elements()) { LevelInfo level = vinfo.level(); @@ -420,7 +391,7 @@ LongArray MetUGridDataFile::collect_time_offsets(VarInfo &vinfo) { = "MetUGridDataFile::collect_time_offsets(VarInfo &) -> "; LongArray time_offsets; - NcVarInfo *info = _file->find_var_name(vinfo_nc->req_name().c_str()); + NcVarInfo *info = _file->find_by_name(vinfo_nc->req_name().c_str()); // Check for variable not found if(!info) { @@ -622,7 +593,7 @@ LongArray MetUGridDataFile::collect_time_offsets(VarInfo &vinfo) { int MetUGridDataFile::index(VarInfo &vinfo){ - if( nullptr == _file->find_var_name( vinfo.name().c_str() ) ) return -1; + if( nullptr == _file->find_by_name( vinfo.name().c_str() ) ) return -1; if( ( vinfo.valid() != 0 && _file->ValidTime[0] != vinfo.valid() ) || ( vinfo.init() != 0 && _file->InitTime != vinfo.init() ) || @@ -704,3 +675,11 @@ long MetUGridDataFile::convert_value_to_offset(double z_value, string z_dim_name } //////////////////////////////////////////////////////////////////////// + + +void MetUGridDataFile::set_map_config_file(ConcatString filename) { + _file->set_map_config_file(filename); +} + + +//////////////////////////////////////////////////////////////////////// diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.h b/src/libcode/vx_data2d_ugrid/data2d_ugrid.h index 473254b660..7a3b1af17c 100644 --- a/src/libcode/vx_data2d_ugrid/data2d_ugrid.h +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.h @@ -100,6 +100,7 @@ class MetUGridDataFile : public Met2dDataFile { bool open (const char * filename); bool open_metadata(const char * filename); + void set_map_config_file(ConcatString filename); void close (); diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.cc b/src/libcode/vx_data2d_ugrid/ugrid_file.cc index 2c6a2c8dd1..153ef46dff 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.cc +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.cc @@ -35,7 +35,8 @@ using namespace netCDF; //////////////////////////////////////////////////////////////////////// -static const char *default_config_filename = +static const char *def_user_config = "UGridConfig_user""; +static const char *def_config_filename = "MET_BASE/config/UGridConfig_default"; array DIM_KEYS = { @@ -71,7 +72,6 @@ UGridFile::UGridFile() //////////////////////////////////////////////////////////////////////// - UGridFile::~UGridFile() { close(); @@ -172,7 +172,9 @@ bool UGridFile::open(const char * filepath) // Close any open files and clear out the associated members close(); - read_config(); + ConcatString config_file = def_config_filename + if (file_exists(default_user_config.c_str())) config_file = def_user_config; + read_config(config_file); if (_ncFile) { delete _ncFile; @@ -188,49 +190,7 @@ bool UGridFile::open(const char * filepath) return false; } - // Pull out the variables - - NcDim dim; - int meta_count = 0; - int max_dim_count = 0; - ConcatString att_value; - StringArray var_names; - - Nvars = get_var_names(_ncFile, &var_names); - for (int j=0; j max_dim_count) max_dim_count = dim_count; - - Var[j].Dims = new NcDim * [dim_count]; - - // parse the variable attributes - get_att_str( Var[j], long_name_att_name, Var[j].long_name_att ); - get_att_str( Var[j], units_att_name, Var[j].units_att ); - - } // for j - - // done - - return true; + return get_var_info(); } @@ -579,12 +539,10 @@ std::string UGridFile::find_metadata_name(std::string &key, StringArray &availab //////////////////////////////////////////////////////////////////////// -NcVarInfo* UGridFile::find_var_name(const char * var_name) const +NcVarInfo* UGridFile::find_by_name(const char * var_name) const { - cout << "UGridFile::find_var_name() Nvars=" << Nvars << ", " << var_name << "\n"; for (int i = 0; i < Nvars; i++) { - cout << "UGridFile::find_var_name() " << Var[i].name << " VS " << var_name << "\n"; if (Var[i].name == var_name) return &Var[i]; } @@ -600,6 +558,8 @@ double UGridFile::getData(NcVar * var, const LongArray & a) const clock_t start_clock = clock(); static const string method_name = "UGridFile::getData(NcVar *, const LongArray &) -> "; + +/* if (!args_ok(a)) { mlog << Error << "\n" << method_name @@ -628,6 +588,7 @@ double UGridFile::getData(NcVar * var, const LongArray & a) const exit ( 1 ); } } +*/ bool status = false; double d = bad_data_double; @@ -636,7 +597,8 @@ double UGridFile::getData(NcVar * var, const LongArray & a) const double missing_value = get_var_missing_value(var); get_var_fill_value(var, fill_value); - status = get_nc_data(var, &d, a); + //status = get_nc_data(var, &d, a); + status = get_nc_data(var, a); if (!status) { @@ -665,40 +627,28 @@ bool UGridFile::getData(NcVar * v, const LongArray & a, DataPlane & plane) const static const string method_name = "UGridFile::getData(NcVar *, const LongArray &, DataPlane &) const -> "; - if (!args_ok(a)) - { - mlog << Error << "\n" << method_name - << "bad arguments:\n"; - a.dump(cerr); - exit(1); - } - - int dim_count = get_dim_count(v); - if (dim_count != a.n_elements()) - { - mlog << Error << "\n" << method_name - << "needed " << (dim_count) << " arguments for variable " - << (GET_NC_NAME_P(v)) << ", got " << (a.n_elements()) << "\n\n"; - exit(1); - } +// if (!args_ok(a)) +// { +// mlog << Error << "\n" << method_name +// << "bad arguments:\n"; +// a.dump(cerr); +// exit(1); +// } +// +// int dim_count = get_dim_count(v); +// if (dim_count != a.n_elements()) +// { +// mlog << Error << "\n" << method_name +// << "needed " << (dim_count) << " arguments for variable " +// << (GET_NC_NAME_P(v)) << ", got " << (a.n_elements()) << "\n\n"; +// exit(1); +// } // find varinfo's - bool found = false; - NcVarInfo *var = (NcVarInfo *)nullptr; - - for (int j = 0; j < Nvars; ++j) - { - if (Var[j].var == v) - { - found = true; - var = Var + j; - break; - } - } + NcVarInfo *var = find_by_name(GET_NC_NAME_P(v).c_str()); - if (!found) - { + if (nullptr == var) { mlog << Error << "\n" << method_name << "variable " << (GET_NC_NAME_P(v)) << " not found!\n\n"; exit(1); @@ -723,9 +673,6 @@ bool UGridFile::getData(NcVar * v, const LongArray & a, DataPlane & plane) const plane.set_size(nx, ny); // get the data - int *i; - short *s; - float *f; const int plane_size = nx * ny; double *d = new double[plane_size]; @@ -760,9 +707,7 @@ bool UGridFile::getData(const char *var_name, const LongArray &a, DataPlane &plane, NcVarInfo *&info) const { - info = find_var_name(var_name); - if (info == nullptr) - return false; + info = find_by_name(var_name); bool found = getData(info->var, a, plane); @@ -804,6 +749,63 @@ StringArray UGridFile::get_metadata_names(std::string &key) { } +//////////////////////////////////////////////////////////////////////// + +bool UGridFile::get_var_info() { + + // Pull out the variables + if (Var) { + delete [] Var; + Var = (NcVarInfo *)nullptr; + } + + NcDim dim; + int meta_count = 0; + int max_dim_count = 0; + ConcatString att_value; + StringArray var_names; + + Nvars = get_var_names(_ncFile, &var_names); + for (int j=0; j max_dim_count) max_dim_count = dim_count; + + Var[j].Dims = new NcDim * [dim_count]; + + // parse the variable attributes + get_att_str( Var[j], long_name_att_name, Var[j].long_name_att ); + get_att_str( Var[j], units_att_name, Var[j].units_att ); + + } // for j + + // done + + return true; +} + //////////////////////////////////////////////////////////////////////// @@ -818,12 +820,12 @@ int UGridFile::lead_time() const //////////////////////////////////////////////////////////////////////// -void UGridFile::read_config() { +void UGridFile::read_config(ConcatString config_filename) { const char *method_name = "UGridFile::read_config()"; MetConfig conf; // Read the default config file - conf.read(replace_path(default_config_filename).c_str()); + conf.read(replace_path(config_filename).c_str()); metadata_map = parse_conf_metadata_map(&conf); metadata_names.clear(); @@ -832,7 +834,7 @@ void UGridFile::read_config() { metadata_names.add(it->second); } - mlog << Debug(4) << method_name + mlog << Debug(6) << method_name << " map size: " << metadata_map.size() << ", dims_vars_count = " << metadata_names.n() << "\n"; } @@ -899,4 +901,17 @@ void UGridFile::read_netcdf_grid() } +//////////////////////////////////////////////////////////////////////// + +void UGridFile::set_map_config_file(ConcatString filename) { + + if (file_exists(filename.c_str())) { + read_config(filename.c_str()); + get_var_info(); + } + else mlog << Warning << "\nUGridFile::set_map_config_file() The UGrid metadata mapping configuration file \"" + << filename << " does not exist. Use the default mapping\n\n"; + +} + //////////////////////////////////////////////////////////////////////// diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.h b/src/libcode/vx_data2d_ugrid/ugrid_file.h index 846f60c0e5..7453d757ab 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.h +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.h @@ -45,6 +45,8 @@ class UGridFile { bool open(const char *filename); bool open_metadata(const char *filename); + bool get_var_info(); + void set_map_config_file(ConcatString filename); void close(); @@ -101,7 +103,7 @@ class UGridFile { bool getData(const char *, const LongArray &, DataPlane &, NcVarInfo *&) const; - NcVarInfo* find_var_name(const char * var_name) const; + NcVarInfo* find_by_name(const char * var_name) const; private: @@ -155,7 +157,7 @@ class UGridFile { std::string find_metadata_name(std::string &key, StringArray &available_names); StringArray get_metadata_names(std::string &key); - void read_config(); + void read_config(ConcatString config_filename); void read_netcdf_grid(); }; diff --git a/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc b/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc index 7b1da7e5ab..15ee2950df 100644 --- a/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc +++ b/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc @@ -97,9 +97,9 @@ void VarInfoUGrid::assign(const VarInfoUGrid &v) { // Copy clear_dimension(); - for(i=0; i Date: Mon, 18 Sep 2023 15:19:35 -0600 Subject: [PATCH 023/109] #2231 Removed command line option for unstructured grid and make is configurable by using the connfiguration file --- src/tools/core/grid_stat/grid_stat.cc | 23 ++++++------------- .../core/grid_stat/grid_stat_conf_info.cc | 6 +++++ .../core/grid_stat/grid_stat_conf_info.h | 2 ++ src/tools/core/point_stat/point_stat.cc | 22 +++++------------- src/tools/core/point_stat/point_stat.h | 2 +- .../core/point_stat/point_stat_conf_info.cc | 8 +++++++ .../core/point_stat/point_stat_conf_info.h | 2 ++ 7 files changed, 32 insertions(+), 33 deletions(-) diff --git a/src/tools/core/grid_stat/grid_stat.cc b/src/tools/core/grid_stat/grid_stat.cc index 981c56493b..620380c5e2 100644 --- a/src/tools/core/grid_stat/grid_stat.cc +++ b/src/tools/core/grid_stat/grid_stat.cc @@ -144,7 +144,7 @@ using namespace netCDF; //////////////////////////////////////////////////////////////////////// -static ConcatString ugrid_nc; + //////////////////////////////////////////////////////////////////////// @@ -191,7 +191,6 @@ static void clean_up(); static void usage(); static void set_outdir(const StringArray &); static void set_compress(const StringArray &); -static void set_ugrid_nc(const StringArray &); static bool read_data_plane(VarInfo* info, DataPlane& dp, Met2dDataFile* mtddf, const ConcatString &filename); @@ -244,7 +243,6 @@ void process_command_line(int argc, char **argv) { // Add the options function calls cline.add(set_outdir, "-outdir", 1); cline.add(set_compress, "-compress", 1); - cline.add(set_ugrid_nc, "-ugrid", 1); // Parse the command line cline.parse(); @@ -272,7 +270,6 @@ void process_command_line(int argc, char **argv) { // Get the forecast and observation file types from config, if present ftype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_fcst)); otype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_obs)); - if (ftype == FileType_None && 0 < ugrid_nc.length()) ftype = FileType_UGrid; // Read forecast file if(!(fcst_mtddf = mtddf_factory.new_met_2d_data_file(fcst_file.c_str(), ftype))) { @@ -296,7 +293,12 @@ void process_command_line(int argc, char **argv) { conf_info.process_config(ftype, otype); if (FileType_UGrid == ftype) { - ((MetUGridDataFile *)fcst_mtddf)->open_metadata(ugrid_nc.c_str()); + ConcatString ugrid_nc = conf_info.ugrid_nc; + ConcatString map_config_file = conf_info.ugrid_map_config; + MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)fcst_mtddf; + if (0 < map_config_file.length()) ugrid_mtddf->set_map_config_file(map_config_file); + if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; + ugrid_mtddf->open_metadata(ugrid_nc.c_str()); } // For python types read the first field to set the grid @@ -3040,7 +3042,6 @@ void usage() { << "\tfcst_file\n" << "\tobs_file\n" << "\tconfig_file\n" - << "\t[-ugrid ugrid_file]\n" << "\t[-outdir path]\n" << "\t[-log file]\n" << "\t[-v level]\n" @@ -3055,9 +3056,6 @@ void usage() { << "\t\t\"config_file\" is a GridStatConfig file containing " << "the desired configuration settings (required).\n" - << "\t\t\"-ugrid ugrid_file\" is the metadata file for unstructured grid " - << " (only required for unstructured grid data).\n" - << "\t\t\"-outdir path\" overrides the default output directory " << "(" << out_dir << ") (optional).\n" @@ -3087,13 +3085,6 @@ void set_compress(const StringArray & a) { //////////////////////////////////////////////////////////////////////// -void set_ugrid_nc(const StringArray & a) -{ - ugrid_nc = a[0]; -} - -//////////////////////////////////////////////////////////////////////// - bool read_data_plane(VarInfo* info, DataPlane& dp, Met2dDataFile* mtddf, const ConcatString &filename) { diff --git a/src/tools/core/grid_stat/grid_stat_conf_info.cc b/src/tools/core/grid_stat/grid_stat_conf_info.cc index a241980d5e..9d9f9816f3 100644 --- a/src/tools/core/grid_stat/grid_stat_conf_info.cc +++ b/src/tools/core/grid_stat/grid_stat_conf_info.cc @@ -131,6 +131,12 @@ void GridStatConfInfo::process_config(GrdFileType ftype, // Conf: tmp_dir tmp_dir = parse_conf_tmp_dir(&conf); + // Conf: ugrid_nc + ugrid_nc = parse_conf_ugrid_metadata_file(&conf); + + // Conf: ugrid_map_config + ugrid_map_config = parse_conf_ugrid_map_config(&conf); + // Conf: output_prefix output_prefix = conf.lookup_string(conf_key_output_prefix); diff --git a/src/tools/core/grid_stat/grid_stat_conf_info.h b/src/tools/core/grid_stat/grid_stat_conf_info.h index f3ebdf5441..d19556be26 100644 --- a/src/tools/core/grid_stat/grid_stat_conf_info.h +++ b/src/tools/core/grid_stat/grid_stat_conf_info.h @@ -283,6 +283,8 @@ class GridStatConfInfo { ConcatString tmp_dir; // Directory for temporary files ConcatString output_prefix; // String to customize output file name ConcatString version; // Config file version + ConcatString ugrid_nc; // NetCDF for coordinate variables of unstructured grid + ConcatString ugrid_map_config; // Configuration file which contains ugrid metadata mapping // Summary of output file options across all verification tasks STATOutputType output_flag[n_txt]; // Flag for each output line type diff --git a/src/tools/core/point_stat/point_stat.cc b/src/tools/core/point_stat/point_stat.cc index a12d434218..95e6d99440 100644 --- a/src/tools/core/point_stat/point_stat.cc +++ b/src/tools/core/point_stat/point_stat.cc @@ -142,7 +142,6 @@ using namespace netCDF; //////////////////////////////////////////////////////////////////////// -static ConcatString ugrid_nc; //////////////////////////////////////////////////////////////////////// @@ -179,7 +178,6 @@ static void set_ncfile(const StringArray &); static void set_obs_valid_beg_time(const StringArray &); static void set_obs_valid_end_time(const StringArray &); static void set_outdir(const StringArray &); -static void set_ugrid_nc(const StringArray &); //////////////////////////////////////////////////////////////////////// @@ -243,7 +241,6 @@ void process_command_line(int argc, char **argv) { cline.add(set_obs_valid_beg_time, "-obs_valid_beg", 1); cline.add(set_obs_valid_end_time, "-obs_valid_end", 1); cline.add(set_outdir, "-outdir", 1); - cline.add(set_ugrid_nc, "-ugrid", 1); // Parse the command line cline.parse(); @@ -284,7 +281,6 @@ void process_command_line(int argc, char **argv) { // Get the forecast file type from config, if present ftype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_fcst)); - if (ftype == FileType_None && 0 < ugrid_nc.length()) ftype = FileType_UGrid; // Read forecast file if(!(fcst_mtddf = mtddf_factory.new_met_2d_data_file(fcst_file.c_str(), ftype))) { @@ -303,7 +299,12 @@ void process_command_line(int argc, char **argv) { shc.set_model(conf_info.model.c_str()); if (FileType_UGrid == ftype) { - ((MetUGridDataFile *)fcst_mtddf)->open_metadata(ugrid_nc.c_str()); + ConcatString ugrid_nc = conf_info.ugrid_nc; + ConcatString map_config_file = conf_info.ugrid_map_config; + MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)fcst_mtddf; + if (0 < map_config_file.length()) ugrid_mtddf->set_map_config_file(map_config_file); + if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; + ugrid_mtddf->open_metadata(ugrid_nc.c_str()); } // Use the first verification task to set the random number generator @@ -2173,7 +2174,6 @@ void usage() { << "\t[-point_obs file]\n" << "\t[-obs_valid_beg time]\n" << "\t[-obs_valid_end time]\n" - << "\t[-ugrid ugrid_file]\n" << "\t[-outdir path]\n" << "\t[-log file]\n" << "\t[-v level]\n\n" @@ -2199,9 +2199,6 @@ void usage() { << "\t\t\"-outdir path\" overrides the default output " << "directory (" << out_dir << ") (optional).\n" - << "\t\t\"-ugrid ugrid_file\" is the metadata file for unstructured grid " - << " (only required for unstructured grid data).\n" - << "\t\t\"-log file\" outputs log messages to the specified " << "file (optional).\n" @@ -2248,10 +2245,3 @@ void set_outdir(const StringArray & a) //////////////////////////////////////////////////////////////////////// -void set_ugrid_nc(const StringArray & a) -{ - ugrid_nc = a[0]; -} - -//////////////////////////////////////////////////////////////////////// - diff --git a/src/tools/core/point_stat/point_stat.h b/src/tools/core/point_stat/point_stat.h index bd0448a603..52fcc9a884 100644 --- a/src/tools/core/point_stat/point_stat.h +++ b/src/tools/core/point_stat/point_stat.h @@ -152,7 +152,7 @@ static Met2dDataFileFactory mtddf_factory; static Met2dDataFile *fcst_mtddf = (Met2dDataFile *) 0; // Pointer to the random number generator to be used -static gsl_rng *rng_ptr = (gsl_rng *) 0; +static gsl_rng *rng_ptr = (gsl_rng *) nullptr; // Strings to be output in the STAT and optional text files static StatHdrColumns shc; diff --git a/src/tools/core/point_stat/point_stat_conf_info.cc b/src/tools/core/point_stat/point_stat_conf_info.cc index c1f6d35af2..4dbb1c0add 100644 --- a/src/tools/core/point_stat/point_stat_conf_info.cc +++ b/src/tools/core/point_stat/point_stat_conf_info.cc @@ -71,6 +71,8 @@ void PointStatConfInfo::clear() { tmp_dir.clear(); output_prefix.clear(); version.clear(); + ugrid_nc.clear(); + ugrid_map_config.clear(); // Deallocate memory if(vx_opt) { delete [] vx_opt; vx_opt = (PointStatVxOpt *) 0; } @@ -121,6 +123,12 @@ void PointStatConfInfo::process_config(GrdFileType ftype) { // Conf: tmp_dir tmp_dir = parse_conf_tmp_dir(&conf); + // Conf: ugrid_nc + ugrid_nc = parse_conf_ugrid_metadata_file(&conf); + + // Conf: ugrid_map_config + ugrid_map_config = parse_conf_ugrid_map_config(&conf); + // Conf: output_prefix output_prefix = conf.lookup_string(conf_key_output_prefix); diff --git a/src/tools/core/point_stat/point_stat_conf_info.h b/src/tools/core/point_stat/point_stat_conf_info.h index 61a5f58ec2..792a511f7c 100644 --- a/src/tools/core/point_stat/point_stat_conf_info.h +++ b/src/tools/core/point_stat/point_stat_conf_info.h @@ -246,6 +246,8 @@ class PointStatConfInfo { ConcatString tmp_dir; // Directory for temporary files ConcatString output_prefix; // String to customize output file name ConcatString version; // Config file version + ConcatString ugrid_nc; // NetCDF for coordinate variables of unstructured grid + ConcatString ugrid_map_config; // Configuration file which contains ugrid metadata mapping // Summary of output file options across all verification tasks STATOutputType output_flag[n_txt]; // Flag for each output line type From 5a05eaa1b700891ec50d24365f96b643bc19cc3d Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Wed, 20 Sep 2023 17:45:36 -0600 Subject: [PATCH 024/109] #2231 Added ugrid_max_distance_km --- src/basic/vx_config/config_constants.h | 7 +- src/basic/vx_config/config_util.cc | 43 +++------ src/basic/vx_config/config_util.h | 7 +- src/libcode/vx_data2d_ugrid/data2d_ugrid.cc | 9 +- src/libcode/vx_data2d_ugrid/data2d_ugrid.h | 3 +- src/libcode/vx_data2d_ugrid/ugrid_file.cc | 91 +++++-------------- src/libcode/vx_data2d_ugrid/ugrid_file.h | 4 +- src/libcode/vx_grid/grid_base.cc | 34 ++++--- src/libcode/vx_grid/unstructured_grid.cc | 66 +++++++++----- src/libcode/vx_grid/unstructured_grid.h | 3 +- src/libcode/vx_grid/unstructured_grid_defs.h | 5 +- src/tools/core/grid_stat/grid_stat.cc | 10 +- .../core/grid_stat/grid_stat_conf_info.cc | 12 ++- .../core/grid_stat/grid_stat_conf_info.h | 3 +- src/tools/core/point_stat/point_stat.cc | 16 +++- .../core/point_stat/point_stat_conf_info.cc | 12 ++- .../core/point_stat/point_stat_conf_info.h | 3 +- 17 files changed, 170 insertions(+), 158 deletions(-) diff --git a/src/basic/vx_config/config_constants.h b/src/basic/vx_config/config_constants.h index 03acebbd98..39e220c9f2 100644 --- a/src/basic/vx_config/config_constants.h +++ b/src/basic/vx_config/config_constants.h @@ -675,14 +675,15 @@ static const char conf_key_trunc_factor[] = "gaussian_trunc_factor"; static const char conf_key_eclv_points[] = "eclv_points"; static const char conf_key_var_name_map[] = "var_name_map"; static const char conf_key_metadata_map[] = "metadata_map"; -static const char conf_key_ugrid_map_config[] = "ugrid_map_config"; -static const char conf_key_ugrid_metadata_map[]= "ugrid_metadata_map"; static const char conf_key_obs_to_qc_map[] = "obs_to_qc_map"; static const char conf_key_missing_thresh[] = "missing_thresh"; static const char conf_key_control_id[] = "control_id"; static const char conf_key_ens_member_ids[] = "ens_member_ids"; static const char conf_key_seeps_p1_thresh[] = "seeps_p1_thresh"; -static const char conf_key_ugrid_metadata_file[] = "ugrid_metadata_file"; +static const char conf_key_ugrid_coordinates_file[] = "ugrid_coordinates_file"; +static const char conf_key_ugrid_max_distance_km[] = "ugrid_max_distance_km"; +static const char conf_key_ugrid_metadata_map[] = "ugrid_metadata_map"; +static const char conf_key_ugrid_user_map_config[] = "ugrid_user_map_config"; // // Entries to override file metadata diff --git a/src/basic/vx_config/config_util.cc b/src/basic/vx_config/config_util.cc index 9985a22338..d88097deb3 100644 --- a/src/basic/vx_config/config_util.cc +++ b/src/basic/vx_config/config_util.cc @@ -293,7 +293,7 @@ ConcatString parse_conf_string(Dictionary *dict, const char *conf_key, const char *method_name = "parse_conf_string() -> "; if(!dict) { - mlog << Error << "\n" << method_name << "empty dictionary!\n\n"; + mlog << Error << "\n" << method_name << "empty dictionary! (" << conf_key <<")\n\n"; exit(1); } @@ -1126,13 +1126,6 @@ map parse_conf_metadata_map(Dictionary *dict) { /////////////////////////////////////////////////////////////////////////////// -map parse_conf_ugrid_metadata_map(Dictionary *dict) { - const char *method_name = "parse_conf_ugrid_metadata_map() -> "; - return parse_conf_key_values_map(dict, conf_key_ugrid_metadata_map, method_name); -} - -/////////////////////////////////////////////////////////////////////////////// - map parse_conf_obs_name_map(Dictionary *dict) { const char *method_name = "parse_conf_obs_name_map() -> "; return parse_conf_key_value_map(dict, conf_key_obs_name_map); @@ -2269,36 +2262,30 @@ WaveletType parse_conf_wavelet_type(Dictionary *dict) { /////////////////////////////////////////////////////////////////////////////// -ConcatString parse_conf_ugrid_map_config(Dictionary *dict) { - ConcatString s; - - if(!dict) { - mlog << Error << "\nparse_conf_ugrid_map_config() -> " - << "empty dictionary!\n\n"; - exit(1); - } +double parse_conf_ugrid_max_distance_km(Dictionary *dict) { + return dict ? dict->lookup_double(conf_key_ugrid_max_distance_km, false) : bad_data_double; +} - s = dict->lookup_string(conf_key_ugrid_map_config); +/////////////////////////////////////////////////////////////////////////////// - return s; +ConcatString parse_conf_ugrid_coordinates_file(Dictionary *dict) { + return dict ? dict->lookup_string(conf_key_ugrid_coordinates_file, false) : ""; } /////////////////////////////////////////////////////////////////////////////// -ConcatString parse_conf_ugrid_metadata_file(Dictionary *dict) { - ConcatString s; - - if(!dict) { - mlog << Error << "\nparse_conf_ugrid_metadata_file() -> " - << "empty dictionary!\n\n"; - exit(1); - } +map parse_conf_ugrid_metadata_map(Dictionary *dict) { + const char *method_name = "parse_conf_ugrid_metadata_map() -> "; + return parse_conf_key_values_map(dict, conf_key_ugrid_metadata_map, method_name); +} - s = dict->lookup_string(conf_key_ugrid_metadata_file); +/////////////////////////////////////////////////////////////////////////////// - return s; +ConcatString parse_conf_ugrid_user_map_config(Dictionary *dict) { + return dict ? dict->lookup_string(conf_key_ugrid_user_map_config, false) : ""; } + /////////////////////////////////////////////////////////////////////////////// diff --git a/src/basic/vx_config/config_util.h b/src/basic/vx_config/config_util.h index a52335988b..71435e1a3e 100644 --- a/src/basic/vx_config/config_util.h +++ b/src/basic/vx_config/config_util.h @@ -64,7 +64,6 @@ extern std::map parse_conf_obs_name_map(Dictionary *dict); extern std::map parse_conf_obs_to_qc_map(Dictionary *dict); -extern std::map parse_conf_ugrid_metadata_map(Dictionary *dict); extern std::map parse_conf_key_convert_map( Dictionary *dict, const char *conf_key_map_name, const char *caller=nullptr); @@ -86,8 +85,10 @@ extern void parse_conf_range_int(Dictionary *dict, int &beg, int &end extern void parse_conf_range_double(Dictionary *dict, double &beg, double &end); extern StringArray parse_conf_ens_member_ids(Dictionary *dict); extern NormalizeType parse_conf_normalize(Dictionary *dict); -extern ConcatString parse_conf_ugrid_map_config(Dictionary *dict); -extern ConcatString parse_conf_ugrid_metadata_file(Dictionary *dict); +extern double parse_conf_ugrid_max_distance_km(Dictionary *dict); +extern ConcatString parse_conf_ugrid_user_map_config(Dictionary *dict); +extern ConcatString parse_conf_ugrid_coordinates_file(Dictionary *dict); +extern std::map parse_conf_ugrid_metadata_map(Dictionary *dict); extern void check_mask_names(const StringArray &); diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc index f4d842e213..d97c824002 100644 --- a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc @@ -676,9 +676,14 @@ long MetUGridDataFile::convert_value_to_offset(double z_value, string z_dim_name //////////////////////////////////////////////////////////////////////// +void MetUGridDataFile::set_max_distance_km(double max_distance) { + _file->set_max_distance_km(max_distance); +} + +//////////////////////////////////////////////////////////////////////// -void MetUGridDataFile::set_map_config_file(ConcatString filename) { - _file->set_map_config_file(filename); +void MetUGridDataFile::set_user_map_config_file(ConcatString filename) { + _file->set_user_map_config_file(filename); } diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.h b/src/libcode/vx_data2d_ugrid/data2d_ugrid.h index 7a3b1af17c..9912eb9170 100644 --- a/src/libcode/vx_data2d_ugrid/data2d_ugrid.h +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.h @@ -100,7 +100,8 @@ class MetUGridDataFile : public Met2dDataFile { bool open (const char * filename); bool open_metadata(const char * filename); - void set_map_config_file(ConcatString filename); + void set_max_distance_km(double max_distance); + void set_user_map_config_file(ConcatString filename); void close (); diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.cc b/src/libcode/vx_data2d_ugrid/ugrid_file.cc index 153ef46dff..51454fd5ff 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.cc +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.cc @@ -35,7 +35,7 @@ using namespace netCDF; //////////////////////////////////////////////////////////////////////// -static const char *def_user_config = "UGridConfig_user""; +static const char *def_user_config = "UGridConfig_user"; static const char *def_config_filename = "MET_BASE/config/UGridConfig_default"; @@ -100,6 +100,7 @@ void UGridFile::init_from_scratch() _lonVar = (NcVar *)nullptr; _xCoordVar = (NcVar *)nullptr; _yCoordVar = (NcVar *)nullptr; + max_distance_km = bad_data_double; // Close any existing file @@ -172,8 +173,8 @@ bool UGridFile::open(const char * filepath) // Close any open files and clear out the associated members close(); - ConcatString config_file = def_config_filename - if (file_exists(default_user_config.c_str())) config_file = def_user_config; + ConcatString config_file = file_exists(def_user_config) + ? def_user_config : def_config_filename; read_config(config_file); if (_ncFile) { @@ -445,13 +446,7 @@ void UGridFile::dump(ostream & out, int depth) const grid.dump(out, depth + 1); out << prefix << "\n"; - out << prefix << "Nc = " << (_ncFile ? "ok" : "(nul)") << "\n"; - - out << prefix << "\n"; - - out << prefix << "Ndims = " << _numDims << "\n"; - out << prefix << "\n"; out << prefix << "face_dim = " << (_faceDim ? GET_NC_NAME_P(_faceDim) : "(nul)") << "\n"; @@ -528,8 +523,6 @@ std::string UGridFile::find_metadata_name(std::string &key, StringArray &availab for (int idx=0; idx found " << meta_name - // << " for " << key << "\n"; break; } } @@ -559,37 +552,6 @@ double UGridFile::getData(NcVar * var, const LongArray & a) const static const string method_name = "UGridFile::getData(NcVar *, const LongArray &) -> "; -/* - if (!args_ok(a)) - { - mlog << Error << "\n" << method_name - << "bad arguments:\n"; - a.dump(cerr); - exit(1); - } - - int dim_count = get_dim_count(var); - if (dim_count != a.n_elements()) - { - mlog << Error << "\n" << method_name - << "needed " << (dim_count) << " arguments for variable " - << (GET_NC_NAME_P(var)) << ", got " << (a.n_elements()) << "\n\n"; - exit(1); - } - - - for (int k=0; kgetDim(k).getSize(); - if (dim_size < a[k]) { - mlog << Error << "\n" << method_name - << "offset (" << a[k] << ") at " << k - << "th dimension (" << long(dim_size) << ") is too big for variable \"" - << GET_NC_NAME_P(var) << "\"\n\n"; - exit ( 1 ); - } - } -*/ - bool status = false; double d = bad_data_double; @@ -627,23 +589,6 @@ bool UGridFile::getData(NcVar * v, const LongArray & a, DataPlane & plane) const static const string method_name = "UGridFile::getData(NcVar *, const LongArray &, DataPlane &) const -> "; -// if (!args_ok(a)) -// { -// mlog << Error << "\n" << method_name -// << "bad arguments:\n"; -// a.dump(cerr); -// exit(1); -// } -// -// int dim_count = get_dim_count(v); -// if (dim_count != a.n_elements()) -// { -// mlog << Error << "\n" << method_name -// << "needed " << (dim_count) << " arguments for variable " -// << (GET_NC_NAME_P(v)) << ", got " << (a.n_elements()) << "\n\n"; -// exit(1); -// } - // find varinfo's NcVarInfo *var = find_by_name(GET_NC_NAME_P(v).c_str()); @@ -780,9 +725,6 @@ bool UGridFile::get_var_info() { for (int j=0; j metadata_map; StringArray metadata_names; + double max_distance_km; // // dimensions diff --git a/src/libcode/vx_grid/grid_base.cc b/src/libcode/vx_grid/grid_base.cc index 8827423321..9d1376c84e 100644 --- a/src/libcode/vx_grid/grid_base.cc +++ b/src/libcode/vx_grid/grid_base.cc @@ -308,11 +308,22 @@ void UnstructuredData::clear() { name = (const char *) nullptr; + Nface = Nnode = Nedge = 0; + max_distance_km = bad_data_double; // disable max_distance + + clear_data(); + +} + + +//////////////////////////////////////////////////////////////////////// + +void UnstructuredData::clear_data() { + Nface = 0; - //distance = -1.; // disable distance + pointLonLat.clear(); lat_checksum = lon_checksum = 0.; - pointLonLat.clear(); if (kdtree) { delete kdtree; kdtree = nullptr; } } @@ -325,9 +336,10 @@ void UnstructuredData::dump() const { mlog << Debug(grid_debug_level) << "\nUnstructured Grid Data:\n" - << " Nface: " << Nface << "\n" - << " lat_checksum: " << lat_checksum << "\n" - << " lon_checksum: " << lon_checksum << "\n" + << " Nface: " << Nface << "\n" + << " lat_checksum: " << lat_checksum << "\n" + << " lon_checksum: " << lon_checksum << "\n" + << " max_distance_km: " << max_distance_km << "\n" ; } @@ -733,17 +745,11 @@ void GridInfo::set(const UnstructuredData & data) clear(); -/* -us = new UnstructuredData(); -memcpy(D, &data, sizeof(data)); -us->Nface = data.Nface; -us->copy_data(data.pointLonLat); -//us = new UnstructuredData(data); -*/ - UnstructuredData *D = new UnstructuredData; -//D->Nface = data.Nface; +D->Nedge = data.Nedge; +D->Nnode = data.Nnode; +D->max_distance_km = data.max_distance_km; D->set_points(data.Nface, data.pointLonLat); us = D; D = (UnstructuredData *)nullptr; diff --git a/src/libcode/vx_grid/unstructured_grid.cc b/src/libcode/vx_grid/unstructured_grid.cc index 03d9e9b0c7..618854bd73 100644 --- a/src/libcode/vx_grid/unstructured_grid.cc +++ b/src/libcode/vx_grid/unstructured_grid.cc @@ -96,12 +96,12 @@ void UnstructuredGrid::set_from_data(const UnstructuredData &data) { clear(); if (data.name) Name = data.name; - Nx = data.Nface;; + Nx = data.Nface; Data.Nface = Nx; Data.Nedge = data.Nedge; Data.Nnode = data.Nnode; - Data.pt_distance = data.pt_distance; + Data.max_distance_km = data.max_distance_km; Data.set_points(Nx, data.pointLonLat); @@ -109,9 +109,9 @@ void UnstructuredGrid::set_from_data(const UnstructuredData &data) { //////////////////////////////////////////////////////////////////////// -void UnstructuredGrid::set_distance(double _distance) { +void UnstructuredGrid::set_max_distance_km(double max_distance) { - Data.pt_distance = _distance; + Data.max_distance_km = max_distance; } @@ -124,19 +124,25 @@ void UnstructuredGrid::latlon_to_xy(double lat, double lon, double &x, double &y IndexKDTree::ValueList neighbor = Data.kdtree->closestPoints(_pointLonLat, 1); size_t index(neighbor[0].payload()); - double distance(neighbor[0].distance()); + double distance_km(neighbor[0].distance()/1000.); + bool is_rejected = (!is_eq(Data.max_distance_km, bad_data_double) + && Data.max_distance_km > 0 + && Data.max_distance_km < distance_km); - x = index; + x = is_rejected ? -1.0 : index; y = 0; - PointLonLat lonlat; - if(distance > 180.0) atlas_geometry.xyz2lonlat(neighbor[0].point(), lonlat); - else lonlat.assign(neighbor[0].point()[0], neighbor[0].point()[1]); + //PointLonLat r_lonlat; + //if(_distance > 180.0) atlas_geometry.xyz2lonlat(neighbor[0].point(), r_lonlat); + //else r_lonlat.assign(neighbor[0].point()[0], neighbor[0].point()[1]); mlog << Debug(UGRID_DEBUG_LEVEL) << "UnstructuredGrid::latlon_to_xy() " - << "input=(" << lon << ", " << lat << ") ==> (" << x << ", " << y - << ") mapped (" << Data.pointLonLat[index].y() << ", " << Data.pointLonLat[index].y() - << ") distance= " << distance << "\n"; + << "input=(" << lon << ", " << lat << ") ==> (" << x << ", " << y << ") == (" + << Data.pointLonLat[index].x() << ", " << Data.pointLonLat[index].y() + << ") distance= " << distance_km << "km, " + << _pointLonLat.distance(Data.pointLonLat[index]) + << " degree, is_rejected: " << is_rejected + << ", max_distanc=" << Data.max_distance_km<< "\n"; } @@ -333,7 +339,7 @@ void Grid::set(const UnstructuredData &data) { UnstructuredData::UnstructuredData() { kdtree = nullptr; - pt_distance = -1.; // disable distance + max_distance_km = bad_data_double; // disable distance clear(); } @@ -349,6 +355,7 @@ void UnstructuredData::build_tree() { atlas::idx_t n = 0; kdtree = new IndexKDTree(atlas_geometry); + kdtree->reserve(Nface); for (int i=0; iNface, us_data->pointLonLat); + Nedge = us_data->Nedge; + Nnode = us_data->Nnode; + max_distance_km = us_data->max_distance_km; +} + +//////////////////////////////////////////////////////////////////////// + void UnstructuredData::set_points(int count, double *_lon, double *_lat) { - clear(); + clear_data(); Nface = count; pointLonLat.reserve(count); @@ -384,21 +409,20 @@ void UnstructuredData::set_points(int count, double *_lon, double *_lat) { //////////////////////////////////////////////////////////////////////// -void UnstructuredData::set_points(int count, const std::vector &_pointLonLat) { +void UnstructuredData::set_points(int count, const std::vector &ptLonLat) { - clear(); + clear_data(); Nface = count; - pointLonLat.reserve(Nface); - + pointLonLat.reserve(count); for (int i=0; i &) first: (" << pointLonLat[0].x() << ", " << pointLonLat[0].y() << ") and last (" << pointLonLat[count-1].x() << ", " << pointLonLat[count-1].y() << ") from (" - << _pointLonLat[0].x() << ", " << _pointLonLat[0].y() << ") and (" - << _pointLonLat[count-1].x() << ", " << _pointLonLat[count-1].y() << ")\n"; + << ptLonLat[0].x() << ", " << ptLonLat[0].y() << ") and (" + << ptLonLat[count-1].x() << ", " << ptLonLat[count-1].y() << ")\n"; build_tree(); diff --git a/src/libcode/vx_grid/unstructured_grid.h b/src/libcode/vx_grid/unstructured_grid.h index e850c03ea5..bdf09a2a77 100644 --- a/src/libcode/vx_grid/unstructured_grid.h +++ b/src/libcode/vx_grid/unstructured_grid.h @@ -47,7 +47,8 @@ class UnstructuredGrid : public GridRep { void clear(); void set_from_data(const UnstructuredData &); - void set_distance(double _distance); + //void set_max_distance_deg(double max_distance); + void set_max_distance_km(double max_distance); // // grid interface diff --git a/src/libcode/vx_grid/unstructured_grid_defs.h b/src/libcode/vx_grid/unstructured_grid_defs.h index fd31bf5a7f..29b9ccfe09 100644 --- a/src/libcode/vx_grid/unstructured_grid_defs.h +++ b/src/libcode/vx_grid/unstructured_grid_defs.h @@ -39,7 +39,7 @@ struct UnstructuredData { int Nface; int Nedge; int Nnode; - double pt_distance; + double max_distance_km; // This should be set after calling set_points() double lat_checksum; double lon_checksum; @@ -52,7 +52,10 @@ struct UnstructuredData { void build_tree(); void set_points(int count, double *_lon, double *_lat); void set_points(int count, const std::vector &); + void copy_from(const UnstructuredData *); + void copy_from(const UnstructuredData &); void clear(); + void clear_data(); void dump() const; }; diff --git a/src/tools/core/grid_stat/grid_stat.cc b/src/tools/core/grid_stat/grid_stat.cc index 620380c5e2..e41a6b8c5e 100644 --- a/src/tools/core/grid_stat/grid_stat.cc +++ b/src/tools/core/grid_stat/grid_stat.cc @@ -227,6 +227,7 @@ void process_command_line(int argc, char **argv) { GrdFileType ftype, otype; ConcatString default_config_file; DataPlane dp; + const char *method_name = "process_command_line() -> "; // Set the default output directory out_dir = replace_path(default_out_dir); @@ -294,11 +295,16 @@ void process_command_line(int argc, char **argv) { if (FileType_UGrid == ftype) { ConcatString ugrid_nc = conf_info.ugrid_nc; - ConcatString map_config_file = conf_info.ugrid_map_config; + ConcatString ugrid_user_map_config = conf_info.ugrid_user_map_config; MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)fcst_mtddf; - if (0 < map_config_file.length()) ugrid_mtddf->set_map_config_file(map_config_file); + ugrid_mtddf->set_max_distance_km(conf_info.ugrid_max_distance_km); + if (0 < ugrid_user_map_config.length()) + ugrid_mtddf->set_user_map_config_file(ugrid_user_map_config); if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; ugrid_mtddf->open_metadata(ugrid_nc.c_str()); + mlog << Debug(9) << method_name + << "ugrid_coordinates_nc: " << ugrid_nc + << " ugrid_max_distance_km: " << conf_info.ugrid_max_distance_km << "\n"; } // For python types read the first field to set the grid diff --git a/src/tools/core/grid_stat/grid_stat_conf_info.cc b/src/tools/core/grid_stat/grid_stat_conf_info.cc index 9d9f9816f3..4c068cf85d 100644 --- a/src/tools/core/grid_stat/grid_stat_conf_info.cc +++ b/src/tools/core/grid_stat/grid_stat_conf_info.cc @@ -67,6 +67,9 @@ void GridStatConfInfo::clear() { tmp_dir.clear(); output_prefix.clear(); version.clear(); + ugrid_nc.clear(); + ugrid_user_map_config.clear(); + ugrid_max_distance_km = bad_data_double; for(i=0; i obs_valid_end_ut) { - mlog << Error << "\nprocess_command_line() -> " + mlog << Error << "\n" << method_name << "the ending time (" << unix_to_yyyymmdd_hhmmss(obs_valid_end_ut) << ") must be greater than the beginning time (" @@ -284,7 +285,7 @@ void process_command_line(int argc, char **argv) { // Read forecast file if(!(fcst_mtddf = mtddf_factory.new_met_2d_data_file(fcst_file.c_str(), ftype))) { - mlog << Error << "\nTrouble reading forecast file \"" + mlog << Error << "\n" << method_name << "Trouble reading forecast file \"" << fcst_file << "\"\n\n"; exit(1); } @@ -300,11 +301,16 @@ void process_command_line(int argc, char **argv) { if (FileType_UGrid == ftype) { ConcatString ugrid_nc = conf_info.ugrid_nc; - ConcatString map_config_file = conf_info.ugrid_map_config; + ConcatString ugrid_user_map_config = conf_info.ugrid_user_map_config; MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)fcst_mtddf; - if (0 < map_config_file.length()) ugrid_mtddf->set_map_config_file(map_config_file); + ugrid_mtddf->set_max_distance_km(conf_info.ugrid_max_distance_km); + if (0 < ugrid_user_map_config.length()) + ugrid_mtddf->set_user_map_config_file(ugrid_user_map_config); if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; ugrid_mtddf->open_metadata(ugrid_nc.c_str()); + mlog << Debug(9) << method_name + << "ugrid_coordinate_nc: " << ugrid_nc + << " ugrid_max_distance_km: " << conf_info.ugrid_max_distance_km << "\n"; } // Use the first verification task to set the random number generator diff --git a/src/tools/core/point_stat/point_stat_conf_info.cc b/src/tools/core/point_stat/point_stat_conf_info.cc index 4dbb1c0add..b941ecf2e8 100644 --- a/src/tools/core/point_stat/point_stat_conf_info.cc +++ b/src/tools/core/point_stat/point_stat_conf_info.cc @@ -72,7 +72,8 @@ void PointStatConfInfo::clear() { output_prefix.clear(); version.clear(); ugrid_nc.clear(); - ugrid_map_config.clear(); + ugrid_user_map_config.clear(); + ugrid_max_distance_km = bad_data_double; // Deallocate memory if(vx_opt) { delete [] vx_opt; vx_opt = (PointStatVxOpt *) 0; } @@ -124,10 +125,13 @@ void PointStatConfInfo::process_config(GrdFileType ftype) { tmp_dir = parse_conf_tmp_dir(&conf); // Conf: ugrid_nc - ugrid_nc = parse_conf_ugrid_metadata_file(&conf); + ugrid_nc = parse_conf_ugrid_coordinates_file(&conf); - // Conf: ugrid_map_config - ugrid_map_config = parse_conf_ugrid_map_config(&conf); + // Conf: ugrid_user_map_config + ugrid_user_map_config = parse_conf_ugrid_user_map_config(&conf); + + // Conf: ugrid_max_distance_km + ugrid_max_distance_km = parse_conf_ugrid_max_distance_km(&conf); // Conf: output_prefix output_prefix = conf.lookup_string(conf_key_output_prefix); diff --git a/src/tools/core/point_stat/point_stat_conf_info.h b/src/tools/core/point_stat/point_stat_conf_info.h index 792a511f7c..1fede798b6 100644 --- a/src/tools/core/point_stat/point_stat_conf_info.h +++ b/src/tools/core/point_stat/point_stat_conf_info.h @@ -247,7 +247,8 @@ class PointStatConfInfo { ConcatString output_prefix; // String to customize output file name ConcatString version; // Config file version ConcatString ugrid_nc; // NetCDF for coordinate variables of unstructured grid - ConcatString ugrid_map_config; // Configuration file which contains ugrid metadata mapping + ConcatString ugrid_user_map_config; // User's configuration file which contains ugrid metadata mapping + double ugrid_max_distance_km; // max distance to be the closest neighbor to unstructured grid // Summary of output file options across all verification tasks STATOutputType output_flag[n_txt]; // Flag for each output line type From e9e09c9531f7ed1967f37a1187fbaccc46eace14 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Fri, 22 Sep 2023 10:40:01 -0600 Subject: [PATCH 025/109] #2231 Exit if user defined metadata maiing configuration file does not exist --- src/libcode/vx_data2d_ugrid/ugrid_file.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.cc b/src/libcode/vx_data2d_ugrid/ugrid_file.cc index 51454fd5ff..33b131618c 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.cc +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.cc @@ -865,9 +865,12 @@ void UGridFile::set_user_map_config_file(ConcatString filename) { read_config(filename.c_str()); get_var_info(); } - else mlog << Warning << "\nUGridFile::set_user_map_config_file()" - << " The UGrid metadata mapping configuration file \"" - << filename << "\" does not exist. Use the default mapping\n\n"; + else { + mlog << Error << "\nUGridFile::set_user_map_config_file()" + << " The UGrid metadata mapping configuration file \"" + << filename << "\" does not exist. Use the default mapping\n\n"; + exit(1); + } } From e77b0331c72bd5357ddbe7fe3b29d1265805c041 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Fri, 22 Sep 2023 10:45:32 -0600 Subject: [PATCH 026/109] #2231 Exit if user defined metadata maiing configuration file does not exist --- src/libcode/vx_data2d_ugrid/ugrid_file.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.cc b/src/libcode/vx_data2d_ugrid/ugrid_file.cc index 33b131618c..315d419a67 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.cc +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.cc @@ -868,7 +868,7 @@ void UGridFile::set_user_map_config_file(ConcatString filename) { else { mlog << Error << "\nUGridFile::set_user_map_config_file()" << " The UGrid metadata mapping configuration file \"" - << filename << "\" does not exist. Use the default mapping\n\n"; + << filename << "\" does not exist.\n\n"; exit(1); } From fd905d1315178614354860927d7c143461ff2b05 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Wed, 4 Oct 2023 08:47:59 -0600 Subject: [PATCH 027/109] 2231 Changed metadat_map to ugrid_metadata_map --- src/libcode/vx_data2d_ugrid/data2d_ugrid.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc index d97c824002..6a0741c724 100644 --- a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc @@ -191,7 +191,6 @@ cout << " FIXME MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane) BoolArray is_offset = vinfo_nc->is_offset(); data_var = _file->find_by_name(vinfo_nc->req_name().c_str()); -/* if (nullptr != data_var) { time_dim_slot = data_var->t_slot; for (int idx=0; idx Date: Wed, 4 Oct 2023 08:50:40 -0600 Subject: [PATCH 028/109] #2231 Added UGridConfig_default --- data/config/Makefile.am | 1 + data/config/Makefile.in | 1 + 2 files changed, 2 insertions(+) diff --git a/data/config/Makefile.am b/data/config/Makefile.am index 8c3e1934de..8b2490fbb2 100644 --- a/data/config/Makefile.am +++ b/data/config/Makefile.am @@ -48,6 +48,7 @@ config_DATA = \ WWMCARegridConfig_default \ PlotModeFieldConfig_default \ Point2GridConfig_default \ + UGridConfig_default \ PlotPointObsConfig_default EXTRA_DIST = ${config_DATA} diff --git a/data/config/Makefile.in b/data/config/Makefile.in index 240167d152..bae4de9257 100644 --- a/data/config/Makefile.in +++ b/data/config/Makefile.in @@ -334,6 +334,7 @@ config_DATA = \ WWMCARegridConfig_default \ PlotModeFieldConfig_default \ Point2GridConfig_default \ + UGridConfig_default \ PlotPointObsConfig_default EXTRA_DIST = ${config_DATA} From 034bbdb435cc70bd32ff0188899cd143ea2f4c9e Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Wed, 4 Oct 2023 09:10:50 -0600 Subject: [PATCH 029/109] 2231 Changed metadat_map to ugrid_metadata_map --- src/libcode/vx_data2d_ugrid/ugrid_file.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.cc b/src/libcode/vx_data2d_ugrid/ugrid_file.cc index 315d419a67..7109a7b4c4 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.cc +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.cc @@ -769,7 +769,7 @@ void UGridFile::read_config(ConcatString config_filename) { // Read the default config file conf.read(replace_path(config_filename).c_str()); - metadata_map = parse_conf_metadata_map(&conf); + metadata_map = parse_conf_ugrid_metadata_map(&conf); metadata_names.clear(); for (std::map::iterator it=metadata_map.begin(); it!=metadata_map.end(); ++it) { From 7b244a5f5e7636a9dcf381639e9be2def0cf29a7 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Fri, 6 Oct 2023 19:52:44 -0600 Subject: [PATCH 030/109] #2231 Restored dimension array --- src/libcode/vx_data2d_ugrid/var_info_ugrid.cc | 326 +++++++++--------- src/libcode/vx_data2d_ugrid/var_info_ugrid.h | 2 +- 2 files changed, 164 insertions(+), 164 deletions(-) diff --git a/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc b/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc index 15ee2950df..e039ac0d01 100644 --- a/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc +++ b/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc @@ -97,9 +97,9 @@ void VarInfoUGrid::assign(const VarInfoUGrid &v) { // Copy clear_dimension(); -// for(i=0; i Date: Fri, 6 Oct 2023 19:53:27 -0600 Subject: [PATCH 031/109] #2231 Changed tab to spaces --- src/libcode/vx_data2d_nccf/var_info_nccf.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcode/vx_data2d_nccf/var_info_nccf.cc b/src/libcode/vx_data2d_nccf/var_info_nccf.cc index 7050fd3018..a77ece6881 100644 --- a/src/libcode/vx_data2d_nccf/var_info_nccf.cc +++ b/src/libcode/vx_data2d_nccf/var_info_nccf.cc @@ -287,7 +287,7 @@ void VarInfoNcCF::set_magic(const ConcatString &nstr, const ConcatString &lstr) level_value = unix_time; as_offset = false; } - else if (is_number(ptr2)) { + else if (is_number(ptr2)) { if (as_offset) level = atoi(ptr2); else { level = vx_data2d_dim_by_value; From 3904784c8b74bec57c6d7adb2d12d07678c6fc61 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Fri, 6 Oct 2023 19:54:15 -0600 Subject: [PATCH 032/109] #2231 Cleanup --- src/libcode/vx_data2d_nccf/data2d_nccf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcode/vx_data2d_nccf/data2d_nccf.h b/src/libcode/vx_data2d_nccf/data2d_nccf.h index 9e33bf909b..f864cdaa5f 100644 --- a/src/libcode/vx_data2d_nccf/data2d_nccf.h +++ b/src/libcode/vx_data2d_nccf/data2d_nccf.h @@ -109,7 +109,7 @@ class MetNcCFDataFile : public Met2dDataFile { //////////////////////////////////////////////////////////////////////// -inline GrdFileType MetNcCFDataFile::file_type () const { return ( FileType_NcCF ); } +inline GrdFileType MetNcCFDataFile::file_type () const { return FileType_NcCF; } //////////////////////////////////////////////////////////////////////// From 94d993c5f2019ed150193031b5b814218c253684 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Fri, 6 Oct 2023 19:59:29 -0600 Subject: [PATCH 033/109] #2231 Process vertical level string --- src/libcode/vx_data2d_ugrid/data2d_ugrid.cc | 362 ++++++++++++++++---- src/libcode/vx_data2d_ugrid/data2d_ugrid.h | 2 + src/libcode/vx_data2d_ugrid/ugrid_file.cc | 123 ++++++- src/libcode/vx_data2d_ugrid/ugrid_file.h | 5 + 4 files changed, 421 insertions(+), 71 deletions(-) diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc index 6a0741c724..e5d2541a02 100644 --- a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc @@ -34,6 +34,11 @@ static const int error_code_missing_time_offsets = 4; static const int error_code_empty_times = 5; static const int error_code_bad_increment = 6; static const int error_code_bad_offset = 7; +static const int error_code_no_vert_dim = 11; +static const int error_code_missing_vert_value = 12; +static const int error_code_missing_vert_values = 13; +static const int error_code_missing_vert_offsets = 14; +static const int error_code_empty_verticals = 15; static const int error_code_unknown = 999; //////////////////////////////////////////////////////////////////////// @@ -79,6 +84,7 @@ void MetUGridDataFile::ugrid_init_from_scratch() { _file = (UGridFile *) nullptr; _cur_time_index = -1; + _cur_vert_index = -1; close(); @@ -174,13 +180,12 @@ bool MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane) plane.clear(); // Check for NA in the requested name - if ( vinfo_nc->req_name() == na_str ) - { - // Store the name of the first data variable -cout << " FIXME MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane) calling find_first_data_var()\n"; -// data_var = find_first_data_var(); -// if (nullptr != data_var) vinfo_nc->set_req_name(data_var->name.c_str()); - } + //if ( vinfo_nc->req_name() == na_str ) + //{ + // // Store the name of the first data variable + // data_var = find_first_data_var(); + // if (nullptr != data_var) vinfo_nc->set_req_name(data_var->name.c_str()); + //} int zdim_slot = bad_data_int; int time_dim_slot = bad_data_int; @@ -192,6 +197,7 @@ cout << " FIXME MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane) data_var = _file->find_by_name(vinfo_nc->req_name().c_str()); if (nullptr != data_var) { + zdim_slot = data_var->z_slot; time_dim_slot = data_var->t_slot; for (int idx=0; idxvlevels.n(); - if (z_cnt > 0) { - - zdim_slot = idx; - org_z_offset = dim_offset; - long z_offset = dim_offset; - string z_dim_name; - if (0 <= data_var->z_slot) { - NcDim z_dim = get_nc_dim(data_var->var, data_var->z_slot); - if (IS_VALID_NC(z_dim)) z_dim_name = GET_NC_NAME(z_dim); - } - if (!is_offset[idx]) { - // convert the value to index for slicing - z_offset = convert_value_to_offset(dim_value[idx], z_dim_name); - } - if ((z_offset >= 0) && (z_offset < z_cnt)) - dimension[idx] = long(z_offset); - else { - if (is_offset[idx]) - mlog << Error << "\n" << method_name << "the requested vertical offset " - << dim_offset << " for \"" << vinfo.req_name() << "\" variable " - << "is out of range (between 0 and " << (z_cnt-1) << ").\n\n"; - else - mlog << Error << "\n" << method_name << "the requested vertical value " - << dim_value[idx] << " for \"" << vinfo.req_name() << "\" variable " - << "does not exist (data size = " << z_cnt << ").\n\n"; - return false; - } + else if (idx == zdim_slot) { + long z_cnt = (long)get_dim_size(_file->get_vert_dim()); + org_z_offset = dim_offset; + long z_offset = dim_offset; + //if (!is_offset[idx]) { + // // convert the value to index for slicing + // z_offset = convert_value_to_offset(dim_value[idx], z_dim_name); + //} + if (z_offset == range_flag) z_offset = _cur_vert_index; // from data_plane_array() + if ((z_offset >= 0) && (z_offset < z_cnt)) { + dimension[idx] = long(z_offset); } + //else { + // if (is_offset[idx]) + // mlog << Error << "\n" << method_name << "the requested vertical offset " + // << dim_offset << " for \"" << vinfo.req_name() << "\" variable " + // << "is out of range (between 0 and " << (z_cnt-1) << ").\n\n"; + // else + // mlog << Error << "\n" << method_name << "the requested vertical value " + // << dim_value[idx] << " for \"" << vinfo.req_name() << "\" variable " + // << "does not exist (data size = " << z_cnt << ").\n\n"; + // return false; + //} } } } @@ -348,34 +347,65 @@ int MetUGridDataFile::data_plane_array(VarInfo &vinfo, // Initialize plane_array.clear(); - LongArray time_offsets = collect_time_offsets(vinfo); - if (0 < time_offsets.n_elements()) { - LevelInfo level = vinfo.level(); - long time_lower = bad_data_int; - long time_upper = bad_data_int; - if (level.type() == LevelType_Time) { - time_lower = level.lower(); - time_upper = level.upper(); - } - - for (int idx=0; idx= debug_level) { + for (int idx=0; idx< time_offsets.n_elements(); idx++ ) { + mlog << Debug(debug_level) << method_name << "time: " + << unix_to_yyyymmdd_hhmmss(_file->ValidTime[time_offsets[idx]]) + << " from index " << time_offsets[idx] << "\n"; + } } } - - int debug_level = 7; - if (mlog.verbosity_level() >= debug_level) { - for (int idx=0; idx< time_offsets.n_elements(); idx++ ) { - mlog << Debug(debug_level) << method_name << "time: " - << unix_to_yyyymmdd_hhmmss(_file->ValidTime[time_offsets[idx]]) - << " from index " << time_offsets[idx] << "\n"; + } + else if (level.type() == LevelType_Pres) { + LongArray vertical_offsets = collect_vertical_offsets(vinfo); + if (0 < vertical_offsets.n_elements()) { + lvl_lower = level.lower(); + lvl_upper = level.upper(); + + for (int idx=0; idx= debug_level) { + // for (int idx=0; idx< vertical_offsets.n_elements(); idx++ ) { + // mlog << Debug(debug_level) << method_name << "vertical: " + // << _file->vlevels[vertical_offsets[idx]] + // << " from index " << vertical_offsets[idx] << "\n"; + // } + //} + } + } + else { // if (level.type() == LevelType_None) { + if (data_plane(vinfo, plane)) { + plane_array.add(plane, lvl_lower, lvl_upper); + n_rec++; } } + return(n_rec); } @@ -428,7 +458,7 @@ LongArray MetUGridDataFile::collect_time_offsets(VarInfo &vinfo) { } else if (is_time_range) { double time_inc = level.increment(); - + time_lower = level.lower(); time_upper = level.upper(); if (time_as_value) { @@ -447,7 +477,7 @@ LongArray MetUGridDataFile::collect_time_offsets(VarInfo &vinfo) { } break; } - + if (0 > next_offset) error_code = error_code_missing_time_values; else if (0 > time_inc) error_code = error_code_bad_increment; else if (0 == time_inc) { // no increment configuration @@ -587,6 +617,218 @@ LongArray MetUGridDataFile::collect_time_offsets(VarInfo &vinfo) { } +//////////////////////////////////////////////////////////////////////// + +LongArray MetUGridDataFile::collect_vertical_offsets(VarInfo &vinfo) { + int n_rec = 0; + bool status = false; + VarInfoUGrid *vinfo_nc = (VarInfoUGrid *)&vinfo; + static const string method_name + = "MetUGridDataFile::collect_vertical_offsets(VarInfo &) -> "; + + LongArray vertical_offsets; + NcVarInfo *info = _file->find_by_name(vinfo_nc->req_name().c_str()); + + // Check for variable not found + if(!info) { + mlog << Warning << "\n" << method_name + << "can't find NetCDF variable \"" << vinfo_nc->req_name() + << "\" in file \"" << Filename << "\".\n\n"; + return(vertical_offsets); + } + + int z_dim_slot = info->z_slot; + int z_dim_size = get_dim_size(_file->get_vert_dim()); + if (0 < z_dim_size && z_dim_slot < 0) { + // The vertical dimension does not exist at the variable and the vertical + // variable exists. Stop vertical slicing and set the vertical offset to 0. + vertical_offsets.add(0); + return(vertical_offsets); + } + + double z_lower = bad_data_double; + double z_upper = bad_data_double; + int error_code = error_code_no_error; + LevelInfo level = vinfo.level(); + LongArray dimension = vinfo_nc->dimension(); + bool is_vert_range = (level.type() == LevelType_Pres); + bool z_as_value = !level.is_offset(); + + long dim_offset = (z_dim_slot >= 0) ? dimension[z_dim_slot] : -1; + bool include_all_verticals = (dim_offset == vx_data2d_star); + + z_as_value = false; // this is not supported yet. + if (include_all_verticals) { + for (int idx=0; idxvlevels[idx] < z_lower) continue; + next_offset = idx; + if (_file->vlevels[idx] != z_lower) + missing_verticals.add(z_lower); + else { + mlog << Debug(9) << method_name << " found the lower vertical " + << z_lower << "\n"; + vertical_offsets.add(idx); + next_offset++; + } + break; + } + + if (0 > next_offset) error_code = error_code_missing_vert_values; + else if (0 > z_inc) error_code = error_code_bad_increment; + else if (0 == z_inc) { // no increment configuration + for (idx=next_offset; idxvlevels[idx] > z_upper) break; + vertical_offsets.add(idx); + mlog << Debug(9) << method_name << " found the vertical " + << _file->vlevels[idx] << "\n"; + } + } + else { + long next_z; + next_z = z_lower + z_inc; + for (idx=next_offset; idxvlevels[idx] > z_upper) break; + else if (_file->vlevels[idx] < next_z) continue; + else if (_file->vlevels[idx] == next_z) { + vertical_offsets.add(idx); + mlog << Debug(9) << method_name << " found the vertical " + << _file->vlevels[idx] << "\n"; + next_z += z_inc; + } + else { // next_z < _file->vlevels[idx] + while (next_z < _file->vlevels[idx]) { + missing_verticals.add(next_z); + next_z += z_inc; + } + if (_file->vlevels[idx] == next_z) { + vertical_offsets.add(idx); + mlog << Debug(9) << method_name << " found the vertical " + << _file->vlevels[idx] << "\n"; + next_z += z_inc; + } + } + if (next_z > z_upper) break; + } + } + } + else if (z_lower < z_dim_size) { + int inc_offset = (z_inc <= 0) ? 1 : z_inc; + int max_vert_offset = z_upper; + if (max_vert_offset == z_dim_size) + missing_verticals.add(z_dim_size); + else if (max_vert_offset > z_dim_size) { + for (idx=z_dim_size; idx<=z_upper; idx++) + missing_verticals.add(idx); + max_vert_offset = z_dim_size - 1; + } + for (idx=z_lower; idx<=max_vert_offset; idx+=inc_offset) { + vertical_offsets.add(idx); + mlog << Debug(9) << method_name << " added index " << idx << "\n"; + } + } + + int missing_count = missing_verticals.n_elements(); + if (0 < missing_count) { + for (idx = 0; idxvlevels[0] << " and " + << _file->vlevels[z_dim_size-1] << "\n"; + else { + mlog << Warning << method_name << "Not found vertical out of " + << z_dim_size << ".\n"; + if (include_all_verticals) error_code = error_code_empty_verticals; + else if (is_vert_range) { + error_code = z_as_value ? error_code_missing_vert_values + : error_code_missing_vert_offsets; + } + } + */ + + // Handling error code + if (error_code > error_code_no_error) { + ConcatString log_msg; + log_msg << "variable \"" << vinfo_nc->req_name() << "\" "; + if (error_code == error_code_no_vert_dim) { + log_msg << "does not support the range of verticals because the vertical dimension is " + << z_dim_size; + } + else if (error_code == error_code_missing_vert_values) { + log_msg << "does not have the matching vertical ranges between " + << z_lower << " and " << z_upper; + if (0 < z_dim_size) { + log_msg << " from [" + << std::to_string(_file->vlevels.min()) << " and " + << std::to_string(_file->vlevels.max()) << "]"; + } + } + else if (error_code == error_code_missing_vert_offsets) { + log_msg << "does not have the matching vertical offsets between " + << nint(z_lower) << " and " << nint(z_upper); + if (0 < z_dim_size) { + log_msg << " [0 <= offset < " << z_dim_size << "]"; + } + } + else if (error_code == error_code_empty_verticals) { + log_msg << "does not have the vertical values"; + } + else if (error_code == error_code_bad_increment) { + log_msg << "was configured with bad increment"; + } + else if (error_code == error_code_bad_offset) { + log_msg << "was configured with the bad vertical offset" + << " (0 <= offset < " << z_dim_size << ")"; + } + else if (error_code == error_code_missing_vert_value) { + long z_value = (z_as_value ? dim_offset : -1); + log_msg << "does not have the matching vertical " + << std::to_string(z_value) << " [" + << std::to_string(_file->vlevels.min()) << " and " + << std::to_string(_file->vlevels.max()) << "]"; + } + else { + log_msg.clear(); + log_msg << "variable \"" << vinfo_nc->req_name() + << "\" has unknown error (" << std::to_string(error_code) << ")"; + } + mlog << Error << "\n" << method_name << log_msg << ".\n\n"; + exit(1); + } + + return(vertical_offsets); +} + + //////////////////////////////////////////////////////////////////////// int MetUGridDataFile::index(VarInfo &vinfo){ diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.h b/src/libcode/vx_data2d_ugrid/data2d_ugrid.h index 9912eb9170..4fc70e6e7e 100644 --- a/src/libcode/vx_data2d_ugrid/data2d_ugrid.h +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.h @@ -36,6 +36,7 @@ class MetUGridDataFile : public Met2dDataFile { long convert_time_to_offset(long time_value); long convert_value_to_offset(double z_value, std::string z_dim_name); LongArray collect_time_offsets(VarInfo &vinfo); + LongArray collect_vertical_offsets(VarInfo &vinfo); MetUGridDataFile(const MetUGridDataFile &); MetUGridDataFile & operator=(const MetUGridDataFile &); @@ -46,6 +47,7 @@ class MetUGridDataFile : public Met2dDataFile { UGridFile * _file; // allocated long _cur_time_index; // current time index to get the data plane (for array of data_plane) + long _cur_vert_index; // current vertical index to get the data plane (for array of data_plane) protected: diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.cc b/src/libcode/vx_data2d_ugrid/ugrid_file.cc index 7109a7b4c4..60658264ab 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.cc +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.cc @@ -217,6 +217,8 @@ bool UGridFile::open_metadata(const char * filepath) NcDim dim; string meta_name; + string time_dim_name; + string vert_dim_name; StringArray dim_names; StringArray meta_names; @@ -245,16 +247,16 @@ bool UGridFile::open_metadata(const char * filepath) } // Time dimension - meta_name = find_metadata_name(DIM_KEYS[3], dim_names); - if (0 < meta_name.length()) { - dim = get_nc_dim(_ncMetaFile, meta_name.c_str()); + time_dim_name = find_metadata_name(DIM_KEYS[3], dim_names); + if (0 < time_dim_name.length()) { + dim = get_nc_dim(_ncMetaFile, time_dim_name.c_str()); _tDim = new NcDim(dim); } // Vertical dimension - meta_name = find_metadata_name(DIM_KEYS[4], dim_names); - if (0 < meta_name.length()) { - dim = get_nc_dim(_ncMetaFile, meta_name.c_str()); + vert_dim_name = find_metadata_name(DIM_KEYS[4], dim_names); + if (0 < vert_dim_name.length()) { + dim = get_nc_dim(_ncMetaFile, vert_dim_name.c_str()); _virtDim = new NcDim(dim); } @@ -411,6 +413,33 @@ bool UGridFile::open_metadata(const char * filepath) // to set the slots. // Should be called after read_netcdf_grid() is called + StringArray dimNames; + for (int j=0; jvar; + } + // Pull out the vertical levels if (IS_VALID_NC_P(z_var)) { @@ -546,6 +575,32 @@ NcVarInfo* UGridFile::find_by_name(const char * var_name) const //////////////////////////////////////////////////////////////////////// +NcVarInfo* UGridFile::find_var_by_dim_name(const char *dim_name) const +{ + NcVarInfo *var = find_by_name(dim_name); + if (!var) { + //StringArray dimNames; + for (int i=0; igetDim(k).getSize(); + if (dim_size < offsets[k]) { + mlog << Error << "\n" << method_name + << "offset (" << offsets[k] << ") at " << k + << "th dimension (" << long(dim_size) << ") is too big for variable \"" + << GET_NC_NAME_P(v) << "\"\n\n"; + exit ( 1 ); + } + } + + + get_nc_data(v, d, lengths, offsets); int offset = 0; for (int x = 0; x< nx; ++x) { @@ -638,6 +732,11 @@ bool UGridFile::getData(NcVar * v, const LongArray & a, DataPlane & plane) const delete [] d; // done + ConcatString log_message; + for (int idx=0; idx Date: Tue, 10 Oct 2023 17:01:46 -0600 Subject: [PATCH 034/109] #2574 Added --enable-ugrid --- INSTALL | 4 +++ Makefile.in | 1 + config.h.in | 3 +++ configure | 69 ++++++++++++++++++++++++++++++++++++++++------------ configure.ac | 41 +++++++++++++++++++++---------- 5 files changed, 90 insertions(+), 28 deletions(-) diff --git a/INSTALL b/INSTALL index c408f5d504..c2a1d3d893 100644 --- a/INSTALL +++ b/INSTALL @@ -179,6 +179,10 @@ sub-directory, or the MET Online Tutorial: Enable compilation of lidar2nc Requires $MET_HDF + --enable-ugrid + Enable compilation of unstructured grid + Requires $MET_ATLAS, $MET_ECKIT, and $MET_UGRID_LD + To configure MET to install all of the available tools in the "bin" subdirectory of your current directory, you would use the following command: diff --git a/Makefile.in b/Makefile.in index 45633a0f95..692b81fde9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -302,6 +302,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/config.h.in b/config.h.in index a858a69152..c686129b5e 100644 --- a/config.h.in +++ b/config.h.in @@ -84,6 +84,9 @@ /* "build tc_utils" */ #undef ENABLE_TC_UTILS +/* "build unstructured grid with Atlas and eckit libraries" */ +#undef ENABLE_UGRID + /* "build wavelet_stat" */ #undef ENABLE_WAVELET_STAT diff --git a/configure b/configure index 904c15c4f1..a96f888112 100755 --- a/configure +++ b/configure @@ -656,6 +656,9 @@ YACC FC_LIBS ENABLE_DEVELOPMENT_FALSE ENABLE_DEVELOPMENT_TRUE +UGRID_LIBS +ENABLE_UGRID_FALSE +ENABLE_UGRID_TRUE PYTHON_LIBS ENABLE_PYTHON_FALSE ENABLE_PYTHON_TRUE @@ -888,6 +891,7 @@ enable_tc_utils enable_gsi_tools enable_grib2 enable_python +enable_ugrid ' ac_precious_vars='build_alias host_alias @@ -1620,6 +1624,8 @@ Optional Features: --disable-gsi_tools Disable compilation of gsi_tools --enable-grib2 Enable compilation of utilities using GRIB2 --enable-python Enable python embedding + --enable-ugrid Enable unstructured grid with Atlas and eckit + libraries Some influential environment variables: CC C compiler command @@ -1639,16 +1645,16 @@ Some influential environment variables: include files are not under the same main proj directory. If used, MET_PROJINC must also be defined and MET_PROJ will be ignored. - MET_ATLAS Where atlas lib and include subdirectories are located. If they + MET_ATLAS Where Atlas lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them. MET_ATLASINC - Where atlas include files are located. Use if the libraries and - include files are not under the same main atlas directory. If + Where Atlas include files are located. Use if the libraries and + include files are not under the same main Atlas directory. If used, MET_ATLASLIB must also be defined and MET_ATLAS will be ignored. MET_ATLASLIB - Where atlas libraries are located. Use if the libraries and - include files are not under the same main atlas directory. If + Where Atlas libraries are located. Use if the libraries and + include files are not under the same main Atlas directory. If used, MET_ATLASINC must also be defined and MET_ATLAS will be ignored. MET_ECKIT Where eckit lib and include subdirectories are located. If they @@ -4624,11 +4630,6 @@ fi # AC_SUBST command line variables. -if (test -n "$MET_ATLASLIB"); then - CPPFLAGS="${CPPFLAGS} -I${MET_ATLASINC}" - LDFLAGS="${LDFLAGS} -L${MET_ATLASLIB}" -fi - # # Look for the Eckit library. # @@ -4656,11 +4657,6 @@ fi # AC_SUBST command line variables. -if (test -n "$MET_ECKITLIB"); then - CPPFLAGS="${CPPFLAGS} -I${MET_ECKITINC}" - LDFLAGS="${LDFLAGS} -L${MET_ECKITLIB}" -fi - # # Look for the NetCDF library. # @@ -6108,6 +6104,45 @@ $as_echo "$as_me: python embedding will not be compiled" >&6;} fi +# Unstructure grid with ECMF libraries (Atlas/ecKit) + +# Check whether --enable-ugrid was given. +if test "${enable_ugrid+set}" = set; then : + enableval=$enable_ugrid; case "${enableval}" in + yes | no ) ENABLE_UGRID="${enableval}" ;; + *) as_fn_error $? "bad value ${enableval} for --enable-ugrid" "$LINENO" 5 ;; + esac +else + ENABLE_UGRID="no" + +fi + + + if test "x$ENABLE_UGRID" = "xyes"; then + ENABLE_UGRID_TRUE= + ENABLE_UGRID_FALSE='#' +else + ENABLE_UGRID_TRUE='#' + ENABLE_UGRID_FALSE= +fi + + +if test "x$ENABLE_UGRID" = "xyes"; then + +$as_echo "#define ENABLE_UGRID /**/" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: unstructured grid will be compiled" >&5 +$as_echo "$as_me: unstructured grid will be compiled" >&6;} + CPPFLAGS="${CPPFLAGS} -I${MET_ATLASINC} -I${MET_ECKITINC} -DWITH_UGRID" + LDFLAGS="${LDFLAGS} -L${MET_ATLASLIB} -L${MET_ECKITLIB} -Wl,-rpath,${MET_ATLASLIB}:${MET_ECKITLIB}" + UGRID_LIBS="-lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: unstructured grid will not be compiled" >&5 +$as_echo "$as_me: unstructured grid will not be compiled" >&6;} + UGRID_LIBS= +fi + + ######################################################################## # Check for the MET_DEVELOPMENT environment variable @@ -9228,6 +9263,10 @@ if test -z "${ENABLE_PYTHON_TRUE}" && test -z "${ENABLE_PYTHON_FALSE}"; then as_fn_error $? "conditional \"ENABLE_PYTHON\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_UGRID_TRUE}" && test -z "${ENABLE_UGRID_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_UGRID\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_DEVELOPMENT_TRUE}" && test -z "${ENABLE_DEVELOPMENT_FALSE}"; then as_fn_error $? "conditional \"ENABLE_DEVELOPMENT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/configure.ac b/configure.ac index 7d5d7fef6c..197de3c971 100644 --- a/configure.ac +++ b/configure.ac @@ -53,9 +53,9 @@ fi # Configure the variables. The help text will appear if the user uses "configure --help". -AC_ARG_VAR([MET_ATLAS], [Where atlas lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them.]) -AC_ARG_VAR([MET_ATLASINC], [Where atlas include files are located. Use if the libraries and include files are not under the same main atlas directory. If used, MET_ATLASLIB must also be defined and MET_ATLAS will be ignored.]) -AC_ARG_VAR([MET_ATLASLIB], [Where atlas libraries are located. Use if the libraries and include files are not under the same main atlas directory. If used, MET_ATLASINC must also be defined and MET_ATLAS will be ignored.]) +AC_ARG_VAR([MET_ATLAS], [Where Atlas lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them.]) +AC_ARG_VAR([MET_ATLASINC], [Where Atlas include files are located. Use if the libraries and include files are not under the same main Atlas directory. If used, MET_ATLASLIB must also be defined and MET_ATLAS will be ignored.]) +AC_ARG_VAR([MET_ATLASLIB], [Where Atlas libraries are located. Use if the libraries and include files are not under the same main Atlas directory. If used, MET_ATLASINC must also be defined and MET_ATLAS will be ignored.]) # Ensure that both or neither are specified. @@ -74,11 +74,6 @@ fi # AC_SUBST command line variables. -if (test -n "$MET_ATLASLIB"); then - CPPFLAGS="${CPPFLAGS} -I${MET_ATLASINC}" - LDFLAGS="${LDFLAGS} -L${MET_ATLASLIB}" -fi - # # Look for the Eckit library. # @@ -106,11 +101,6 @@ fi # AC_SUBST command line variables. -if (test -n "$MET_ECKITLIB"); then - CPPFLAGS="${CPPFLAGS} -I${MET_ECKITINC}" - LDFLAGS="${LDFLAGS} -L${MET_ECKITLIB}" -fi - # # Look for the NetCDF library. # @@ -1098,6 +1088,31 @@ else fi AC_SUBST([PYTHON_LIBS]) +# Unstructure grid with ECMF libraries (Atlas/ecKit) + +AC_ARG_ENABLE(ugrid, + [AS_HELP_STRING([--enable-ugrid], [Enable unstructured grid with Atlas and eckit libraries])], + [case "${enableval}" in + yes | no ) ENABLE_UGRID="${enableval}" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-ugrid) ;; + esac], + [ENABLE_UGRID="no"] +) + +AM_CONDITIONAL([ENABLE_UGRID], [test "x$ENABLE_UGRID" = "xyes"]) + +if test "x$ENABLE_UGRID" = "xyes"; then + AC_DEFINE([ENABLE_UGRID], [], ["build unstructured grid with Atlas and eckit libraries"]) + AC_MSG_NOTICE([unstructured grid will be compiled]) + CPPFLAGS="${CPPFLAGS} -I${MET_ATLASINC} -I${MET_ECKITINC} -DWITH_UGRID" + LDFLAGS="${LDFLAGS} -L${MET_ATLASLIB} -L${MET_ECKITLIB} -Wl,-rpath,${MET_ATLASLIB}:${MET_ECKITLIB}" + UGRID_LIBS="-lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry" +else + AC_MSG_NOTICE([unstructured grid will not be compiled]) + UGRID_LIBS= +fi +AC_SUBST([UGRID_LIBS]) + ######################################################################## # Check for the MET_DEVELOPMENT environment variable From 254b70ec458786d63bb7ad1de0af96a6dd09422d Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 10 Oct 2023 17:03:07 -0600 Subject: [PATCH 035/109] #2574 Excluded Atlas and ecKit libraries at LDFLAGS --- internal/scripts/environment/development.seneca | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/scripts/environment/development.seneca b/internal/scripts/environment/development.seneca index 9576abd644..cc623c8d95 100644 --- a/internal/scripts/environment/development.seneca +++ b/internal/scripts/environment/development.seneca @@ -38,7 +38,6 @@ export CXXFLAGS=${CFLAGS} export LDFLAGS="-Wl,--disable-new-dtags" export LDFLAGS="${LDFLAGS} -Wl,-rpath,${MET_DST}/lib:${MET_HDFEOS}/lib:${MET_PROJ}/lib:${MET_NETCDF}/lib:${MET_DST}/zlib-1.2.11/lib:${MET_DST}/szip-2.1.1/lib" export LDFLAGS="${LDFLAGS} -Wl,-rpath,${MET_HDFLIB}:${MET_HDF5}/lib:${MET_GSL}/lib:${MET_PYTHON}/lib:${MET_JASPER}/lib" -export LDFLAGS="${LDFLAGS} -Wl,-rpath,${MET_ATLAS}/lib:${MET_ECKIT}/lib" export LDFLAGS="${LDFLAGS} -L${MET_JASPER}/lib" # Variables required to run MET From c07ae28d1c2a36e0f5aa937b7cea3cba24559621 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 10 Oct 2023 17:04:21 -0600 Subject: [PATCH 036/109] #2574 Added --enable-ugrid --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index c2a1d3d893..716fae39b4 100644 --- a/INSTALL +++ b/INSTALL @@ -181,7 +181,7 @@ sub-directory, or the MET Online Tutorial: --enable-ugrid Enable compilation of unstructured grid - Requires $MET_ATLAS, $MET_ECKIT, and $MET_UGRID_LD + Requires $MET_ATLAS and $MET_ECKIT To configure MET to install all of the available tools in the "bin" subdirectory of your current directory, you would use the following command: From ab20cf6b6dadabbfc210fbaae7d0745b8fa25184 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 10 Oct 2023 17:07:04 -0600 Subject: [PATCH 037/109] #2574 Made conditional build for the unstructured grid --- .../vx_data2d_factory/data2d_factory.cc | 21 ++++++++++++++----- .../vx_data2d_factory/var_info_factory.cc | 14 +++++++------ src/libcode/vx_grid/grid_base.cc | 21 ++++++++++++++++++- src/libcode/vx_grid/grid_base.h | 13 +++++++++++- src/tools/core/grid_stat/grid_stat.cc | 4 ++++ .../core/grid_stat/grid_stat_conf_info.cc | 4 ++++ .../core/grid_stat/grid_stat_conf_info.h | 2 ++ src/tools/core/point_stat/point_stat.cc | 4 ++++ .../core/point_stat/point_stat_conf_info.cc | 5 ++++- .../core/point_stat/point_stat_conf_info.h | 2 ++ 10 files changed, 76 insertions(+), 14 deletions(-) diff --git a/src/libcode/vx_data2d_factory/data2d_factory.cc b/src/libcode/vx_data2d_factory/data2d_factory.cc index 90679c72c8..36b0b041d3 100644 --- a/src/libcode/vx_data2d_factory/data2d_factory.cc +++ b/src/libcode/vx_data2d_factory/data2d_factory.cc @@ -23,7 +23,9 @@ using namespace std; #include "data2d_nc_met.h" #include "data2d_nc_pinterp.h" #include "data2d_nccf.h" +#ifdef WITH_UGRID #include "data2d_ugrid.h" +#endif #ifdef WITH_PYTHON @@ -47,6 +49,7 @@ Met2dDataFile * Met2dDataFileFactory::new_met_2d_data_file(GrdFileType type) { Met2dDataFile *mtddf = (Met2dDataFile *) nullptr; + const char *method_name ="Met2dDataFileFactory::new_met_2d_data_file() -> "; #ifdef WITH_PYTHON MetPythonDataFile * p = nullptr; @@ -67,7 +70,7 @@ MetPythonDataFile * p = nullptr; #ifdef WITH_GRIB2 mtddf = new MetGrib2DataFile; #else - mlog << Error << "\nMet2dDataFileFactory::new_met_2d_data_file() -> " + mlog << Error << "\n" << method_name << "Support for GRIB2 has not been compiled!\n" << "To read GRIB2 files, recompile with the --enable-grib2 option.\n\n"; exit(1); @@ -105,28 +108,36 @@ MetPythonDataFile * p = nullptr; case FileType_Python_Numpy: case FileType_Python_Xarray: - python_compile_error("Met2dDataFileFactory::new_met_2d_data_file() -> "); + python_compile_error(method_name); #endif case FileType_HdfEos: - mlog << Error << "\nMet2dDataFileFactory::new_met_2d_data_file() -> " + mlog << Error << "\n" << method_name << "Support for GrdFileType = \"" << grdfiletype_to_string(type) << "\" not yet implemented!\n\n"; exit(1); case FileType_Bufr: - mlog << Error << "\nMet2dDataFileFactory::new_met_2d_data_file() -> " + mlog << Error << "\n" << method_name << "cannot use this factory to read files of type \"" << grdfiletype_to_string(type) << "\"\n\n"; exit(1); case FileType_UGrid: +#ifdef WITH_UGRID // For FileType_None, silently return a nullptr pointer mtddf = new MetUGridDataFile; break; +#else + mlog << Error << "\n" << method_name + << "data file type \"" << grdfiletype_to_string(type) + << "\" is not activated. Recompile with the --enable-ugrid option" + << "\"\n\n"; + exit(1); +#endif case FileType_None: // For FileType_None, silently return a nullptr pointer @@ -134,7 +145,7 @@ MetPythonDataFile * p = nullptr; break; default: - mlog << Error << "\nMet2dDataFileFactory::new_met_2d_data_file() -> " + mlog << Error << "\n" << method_name << "unsupported gridded data file type \"" << grdfiletype_to_string(type) << "\"\n\n"; exit(1); diff --git a/src/libcode/vx_data2d_factory/var_info_factory.cc b/src/libcode/vx_data2d_factory/var_info_factory.cc index 5e37d76805..92580f5fce 100644 --- a/src/libcode/vx_data2d_factory/var_info_factory.cc +++ b/src/libcode/vx_data2d_factory/var_info_factory.cc @@ -53,6 +53,7 @@ VarInfo * VarInfoFactory::new_var_info(GrdFileType type) { VarInfo *vi = (VarInfo *) 0; + const char *method_name = "VarInfoFactory::new_var_info() -> "; #ifdef WITH_PYTHON VarInfoPython * p = 0; @@ -74,7 +75,7 @@ VarInfo * VarInfoFactory::new_var_info(GrdFileType type) vi = new VarInfoGrib2; break; #else - mlog << Error << "\nVarInfoFactory::new_var_info() -> " + mlog << Error << "\n" << method_name << "Support for GRIB2 has not been compiled!\n" << "To read GRIB2 files, recompile with the --enable-grib2 option.\n\n"; exit(1); @@ -97,32 +98,33 @@ VarInfo * VarInfoFactory::new_var_info(GrdFileType type) p = 0; break; #else - python_compile_error("VarInfoFactory::new_var_info() -> "); + python_compile_error(method_name); #endif case FileType_NcCF: vi = new VarInfoNcCF; break; +#ifdef WITH_UGRID case FileType_UGrid: vi = new VarInfoUGrid; break; +#endif case FileType_HdfEos: - mlog << Error << "\nVarInfoFactory::new_var_info() -> " + mlog << Error << "\n" << method_name << "Support for GrdFileType = " << grdfiletype_to_string(type) << " not yet implemented!\n\n"; exit(1); default: - mlog << Error << "\nVarInfoFactory::new_var_info() -> " + mlog << Error << "\n" << method_name << "unsupported gridded data file type \"" << grdfiletype_to_string(type) << "\"\n\n"; exit(1); } // end switch - mlog << Debug(4) - << "VarInfoFactory::new_var_info() -> " + mlog << Debug(4) << method_name << "created new VarInfo object of type \"" << grdfiletype_to_string(type) << "\".\n"; diff --git a/src/libcode/vx_grid/grid_base.cc b/src/libcode/vx_grid/grid_base.cc index 9d1376c84e..a79f48fab9 100644 --- a/src/libcode/vx_grid/grid_base.cc +++ b/src/libcode/vx_grid/grid_base.cc @@ -304,6 +304,8 @@ times.clear(); //////////////////////////////////////////////////////////////////////// +#ifdef WITH_UGRID + void UnstructuredData::clear() { name = (const char *) nullptr; @@ -343,6 +345,8 @@ void UnstructuredData::dump() const { ; } +#endif + //////////////////////////////////////////////////////////////////////// @@ -421,7 +425,9 @@ gi = (const GoesImagerData *) nullptr; la = (const LaeaData *) nullptr; tc = (const TcrmwData *) nullptr; sl = (const SemiLatLonData *) nullptr; +#ifdef WITH_UGRID us = (const UnstructuredData *) nullptr; +#endif clear(); @@ -447,7 +453,9 @@ if ( gi ) { delete gi; gi = (const GoesImagerData *) nullptr; }; if ( la ) { delete la; la = (const LaeaData *) nullptr; }; if ( tc ) { delete tc; tc = (const TcrmwData *) nullptr; }; if ( sl ) { delete sl; sl = (const SemiLatLonData *) nullptr; }; +#ifdef WITH_UGRID if ( us ) { delete us; us = (const UnstructuredData *) nullptr; }; +#endif return; @@ -470,7 +478,9 @@ if ( info.g ) set( *(info.g) ); if ( info.gi ) set( *(info.gi) ); if ( info.la ) set( *(info.la) ); if ( info.sl ) set( *(info.sl) ); +#ifdef WITH_UGRID if ( info.us ) set( *(info.us) ); +#endif return; @@ -495,7 +505,9 @@ if ( g ) ++count; if ( gi ) ++count; if ( la ) ++count; if ( sl ) ++count; +#ifdef WITH_UGRID if ( us ) ++count; +#endif return count == 1; @@ -526,7 +538,9 @@ else if ( g ) gg.set( *g ); else if ( gi ) gg.set( *gi ); else if ( la ) gg.set( *la ); else if ( sl ) gg.set( *sl ); +#ifdef WITH_UGRID else if ( us ) gg.set( *us ); +#endif return; @@ -739,6 +753,7 @@ return; //////////////////////////////////////////////////////////////////////// +#ifdef WITH_UGRID void GridInfo::set(const UnstructuredData & data) { @@ -755,6 +770,7 @@ us = D; D = (UnstructuredData *)nullptr; } +#endif //////////////////////////////////////////////////////////////////////// @@ -1407,7 +1423,9 @@ else if ( i1.g && i2.g ) return ( is_eq(i1.g, i2.g ) ); else if ( i1.gi && i2.gi ) return ( is_eq(i1.gi, i2.gi ) ); else if ( i1.la && i2.la ) return ( is_eq(i1.la, i2.la ) ); else if ( i1.sl && i2.sl ) return ( is_eq(i1.sl, i2.sl ) ); +#ifdef WITH_UGRID else if ( i1.us && i2.us ) return ( is_eq(i1.us, i2.us ) ); +#endif return false; @@ -1666,7 +1684,7 @@ return status; //////////////////////////////////////////////////////////////////////// - +#ifdef WITH_UGRID bool is_eq(const UnstructuredData * us1, const UnstructuredData * us2) { @@ -1686,6 +1704,7 @@ bool is_eq(const UnstructuredData * us1, const UnstructuredData * us2) return status; } +#endif //////////////////////////////////////////////////////////////////////// diff --git a/src/libcode/vx_grid/grid_base.h b/src/libcode/vx_grid/grid_base.h index 6a9047dbe5..feb2c51390 100644 --- a/src/libcode/vx_grid/grid_base.h +++ b/src/libcode/vx_grid/grid_base.h @@ -30,8 +30,9 @@ #include "goes_grid_defs.h" #include "laea_grid_defs.h" #include "semilatlon_grid_defs.h" +#ifdef WITH_UGRID #include "unstructured_grid_defs.h" - +#endif //////////////////////////////////////////////////////////////////////// @@ -73,7 +74,9 @@ class GridInfo { void set(const TcrmwData &); void set(const LaeaData &); void set(const SemiLatLonData &); +#ifdef WITH_UGRID void set(const UnstructuredData &); +#endif void create_grid(Grid &) const; @@ -91,7 +94,9 @@ class GridInfo { const TcrmwData * tc; // allocated const LaeaData * la; // allocated const SemiLatLonData * sl; // allocated +#ifdef WITH_UGRID const UnstructuredData * us; // allocated +#endif }; @@ -213,7 +218,9 @@ class Grid : public GridInterface { Grid(const LaeaData &); Grid(const LaeaNetcdfData &); Grid(const SemiLatLonData &); +#ifdef WITH_UGRID Grid(const UnstructuredData &); +#endif virtual ~Grid(); Grid(const Grid &); Grid & operator=(const Grid &); @@ -236,7 +243,9 @@ class Grid : public GridInterface { void set (const LaeaData &); void set (const LaeaNetcdfData &); void set (const SemiLatLonData &); +#ifdef WITH_UGRID void set (const UnstructuredData &); +#endif void set_swap_to_north(bool swap_to_north); bool get_swap_to_north() const; @@ -298,7 +307,9 @@ extern bool is_eq(const GaussianData *, const GaussianData *); extern bool is_eq(const GoesImagerData *, const GoesImagerData *); extern bool is_eq(const LaeaData *, const LaeaData *); extern bool is_eq(const SemiLatLonData *, const SemiLatLonData *); +#ifdef WITH_UGRID extern bool is_eq(const UnstructuredData *, const UnstructuredData *); +#endif //////////////////////////////////////////////////////////////////////// diff --git a/src/tools/core/grid_stat/grid_stat.cc b/src/tools/core/grid_stat/grid_stat.cc index e41a6b8c5e..19431244a4 100644 --- a/src/tools/core/grid_stat/grid_stat.cc +++ b/src/tools/core/grid_stat/grid_stat.cc @@ -136,7 +136,9 @@ #include "vx_log.h" #include "seeps.h" +#ifdef WITH_UGRID #include "vx_data2d_ugrid.h" +#endif using namespace std; using namespace netCDF; @@ -293,6 +295,7 @@ void process_command_line(int argc, char **argv) { // Process the configuration conf_info.process_config(ftype, otype); +#ifdef WITH_UGRID if (FileType_UGrid == ftype) { ConcatString ugrid_nc = conf_info.ugrid_nc; ConcatString ugrid_user_map_config = conf_info.ugrid_user_map_config; @@ -306,6 +309,7 @@ void process_command_line(int argc, char **argv) { << "ugrid_coordinates_nc: " << ugrid_nc << " ugrid_max_distance_km: " << conf_info.ugrid_max_distance_km << "\n"; } +#endif // For python types read the first field to set the grid if(is_python_grdfiletype(ftype)) { diff --git a/src/tools/core/grid_stat/grid_stat_conf_info.cc b/src/tools/core/grid_stat/grid_stat_conf_info.cc index 4c068cf85d..426cef0e29 100644 --- a/src/tools/core/grid_stat/grid_stat_conf_info.cc +++ b/src/tools/core/grid_stat/grid_stat_conf_info.cc @@ -67,9 +67,11 @@ void GridStatConfInfo::clear() { tmp_dir.clear(); output_prefix.clear(); version.clear(); +#ifdef WITH_UGRID ugrid_nc.clear(); ugrid_user_map_config.clear(); ugrid_max_distance_km = bad_data_double; +#endif for(i=0; i Date: Tue, 10 Oct 2023 17:19:47 -0600 Subject: [PATCH 038/109] #2574 Added UGRID_LIBS --- scripts/Rscripts/Makefile.in | 1 + scripts/Rscripts/include/Makefile.in | 1 + scripts/python/Makefile.in | 1 + scripts/python/examples/Makefile.in | 1 + scripts/python/met/Makefile.in | 1 + scripts/python/pyembed/Makefile.in | 1 + scripts/python/tc_diag/Makefile.in | 1 + scripts/python/utility/Makefile.in | 1 + src/Makefile.in | 1 + src/basic/Makefile.in | 1 + src/basic/enum_to_string/Makefile.in | 1 + src/basic/vx_cal/Makefile.in | 1 + src/basic/vx_config/Makefile.in | 1 + src/basic/vx_log/Makefile.in | 1 + src/basic/vx_math/Makefile.in | 1 + src/basic/vx_util/Makefile.in | 1 + src/basic/vx_util_math/Makefile.in | 1 + src/libcode/vx_afm/Makefile.in | 1 + src/libcode/vx_analysis_util/Makefile.in | 1 + src/libcode/vx_bool_calc/Makefile.in | 1 + src/libcode/vx_color/Makefile.in | 1 + src/libcode/vx_data2d/Makefile.in | 1 + src/libcode/vx_data2d_grib/Makefile.in | 1 + src/libcode/vx_data2d_grib2/Makefile.in | 1 + src/libcode/vx_data2d_nc_met/Makefile.in | 1 + src/libcode/vx_data2d_nc_pinterp/Makefile.in | 1 + src/libcode/vx_data2d_nccf/Makefile.in | 1 + src/libcode/vx_data2d_python/Makefile.in | 1 + src/libcode/vx_geodesy/Makefile.in | 1 + src/libcode/vx_gis/Makefile.in | 1 + src/libcode/vx_gnomon/Makefile.in | 1 + src/libcode/vx_gsl_prob/Makefile.in | 1 + src/libcode/vx_nav/Makefile.in | 1 + src/libcode/vx_nc_obs/Makefile.in | 1 + src/libcode/vx_nc_util/Makefile.in | 1 + src/libcode/vx_pb_util/Makefile.in | 1 + src/libcode/vx_physics/Makefile.in | 1 + src/libcode/vx_plot_util/Makefile.in | 1 + src/libcode/vx_pointdata_python/Makefile.in | 1 + src/libcode/vx_ps/Makefile.in | 1 + src/libcode/vx_pxm/Makefile.in | 1 + src/libcode/vx_python3_utils/Makefile.in | 1 + src/libcode/vx_regrid/Makefile.in | 1 + src/libcode/vx_render/Makefile.in | 1 + src/libcode/vx_seeps/Makefile.in | 1 + src/libcode/vx_series_data/Makefile.in | 1 + src/libcode/vx_shapedata/Makefile.in | 1 + src/libcode/vx_solar/Makefile.in | 1 + src/libcode/vx_stat_out/Makefile.in | 1 + src/libcode/vx_statistics/Makefile.in | 1 + src/libcode/vx_summary/Makefile.in | 1 + src/libcode/vx_tc_util/Makefile.in | 1 + src/libcode/vx_time_series/Makefile.in | 1 + 53 files changed, 53 insertions(+) diff --git a/scripts/Rscripts/Makefile.in b/scripts/Rscripts/Makefile.in index 8f010abdf9..ed21e28921 100644 --- a/scripts/Rscripts/Makefile.in +++ b/scripts/Rscripts/Makefile.in @@ -307,6 +307,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/scripts/Rscripts/include/Makefile.in b/scripts/Rscripts/include/Makefile.in index 86e7fbd9c4..54b8a7df26 100644 --- a/scripts/Rscripts/include/Makefile.in +++ b/scripts/Rscripts/include/Makefile.in @@ -247,6 +247,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/scripts/python/Makefile.in b/scripts/python/Makefile.in index b4e0d57d3a..a5ab9e9942 100644 --- a/scripts/python/Makefile.in +++ b/scripts/python/Makefile.in @@ -279,6 +279,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/scripts/python/examples/Makefile.in b/scripts/python/examples/Makefile.in index fa55168ccf..58d89aa6e1 100644 --- a/scripts/python/examples/Makefile.in +++ b/scripts/python/examples/Makefile.in @@ -249,6 +249,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/scripts/python/met/Makefile.in b/scripts/python/met/Makefile.in index e9b4f8ce79..cc1850d74f 100644 --- a/scripts/python/met/Makefile.in +++ b/scripts/python/met/Makefile.in @@ -249,6 +249,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/scripts/python/pyembed/Makefile.in b/scripts/python/pyembed/Makefile.in index b56b809961..96d65d1711 100644 --- a/scripts/python/pyembed/Makefile.in +++ b/scripts/python/pyembed/Makefile.in @@ -307,6 +307,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/scripts/python/tc_diag/Makefile.in b/scripts/python/tc_diag/Makefile.in index becca2dbd4..bf65ff232b 100644 --- a/scripts/python/tc_diag/Makefile.in +++ b/scripts/python/tc_diag/Makefile.in @@ -249,6 +249,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/scripts/python/utility/Makefile.in b/scripts/python/utility/Makefile.in index 742a8ab19c..44ef459c1e 100644 --- a/scripts/python/utility/Makefile.in +++ b/scripts/python/utility/Makefile.in @@ -249,6 +249,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/Makefile.in b/src/Makefile.in index 8417fa4e17..40b835daa5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -277,6 +277,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/basic/Makefile.in b/src/basic/Makefile.in index a9b55ed34b..398d571c04 100644 --- a/src/basic/Makefile.in +++ b/src/basic/Makefile.in @@ -279,6 +279,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/basic/enum_to_string/Makefile.in b/src/basic/enum_to_string/Makefile.in index 65a212669a..1d65d58f27 100644 --- a/src/basic/enum_to_string/Makefile.in +++ b/src/basic/enum_to_string/Makefile.in @@ -296,6 +296,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/basic/vx_cal/Makefile.in b/src/basic/vx_cal/Makefile.in index c69eee1b29..3c5e4acf66 100644 --- a/src/basic/vx_cal/Makefile.in +++ b/src/basic/vx_cal/Makefile.in @@ -303,6 +303,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/basic/vx_config/Makefile.in b/src/basic/vx_config/Makefile.in index 28e6d856af..4781233924 100644 --- a/src/basic/vx_config/Makefile.in +++ b/src/basic/vx_config/Makefile.in @@ -351,6 +351,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/basic/vx_log/Makefile.in b/src/basic/vx_log/Makefile.in index 9f8cc0f0c8..cd26c0b460 100644 --- a/src/basic/vx_log/Makefile.in +++ b/src/basic/vx_log/Makefile.in @@ -282,6 +282,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/basic/vx_math/Makefile.in b/src/basic/vx_math/Makefile.in index f001e29200..dfce6b2c72 100644 --- a/src/basic/vx_math/Makefile.in +++ b/src/basic/vx_math/Makefile.in @@ -296,6 +296,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/basic/vx_util/Makefile.in b/src/basic/vx_util/Makefile.in index a6ed156465..4eab9e0dd4 100644 --- a/src/basic/vx_util/Makefile.in +++ b/src/basic/vx_util/Makefile.in @@ -401,6 +401,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/basic/vx_util_math/Makefile.in b/src/basic/vx_util_math/Makefile.in index 6e8aeed609..ad36887abf 100644 --- a/src/basic/vx_util_math/Makefile.in +++ b/src/basic/vx_util_math/Makefile.in @@ -281,6 +281,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_afm/Makefile.in b/src/libcode/vx_afm/Makefile.in index 6ec7f7b88e..7a719a9b05 100644 --- a/src/libcode/vx_afm/Makefile.in +++ b/src/libcode/vx_afm/Makefile.in @@ -290,6 +290,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_analysis_util/Makefile.in b/src/libcode/vx_analysis_util/Makefile.in index df6b173c08..ae576263c5 100644 --- a/src/libcode/vx_analysis_util/Makefile.in +++ b/src/libcode/vx_analysis_util/Makefile.in @@ -297,6 +297,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_bool_calc/Makefile.in b/src/libcode/vx_bool_calc/Makefile.in index 80d009ee76..794b4332e6 100644 --- a/src/libcode/vx_bool_calc/Makefile.in +++ b/src/libcode/vx_bool_calc/Makefile.in @@ -292,6 +292,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_color/Makefile.in b/src/libcode/vx_color/Makefile.in index 7fc3b7a932..87fab3c9fc 100644 --- a/src/libcode/vx_color/Makefile.in +++ b/src/libcode/vx_color/Makefile.in @@ -309,6 +309,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_data2d/Makefile.in b/src/libcode/vx_data2d/Makefile.in index e6c1312a73..6ba460012e 100644 --- a/src/libcode/vx_data2d/Makefile.in +++ b/src/libcode/vx_data2d/Makefile.in @@ -292,6 +292,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_data2d_grib/Makefile.in b/src/libcode/vx_data2d_grib/Makefile.in index 1f6ddea311..b87d2ec376 100644 --- a/src/libcode/vx_data2d_grib/Makefile.in +++ b/src/libcode/vx_data2d_grib/Makefile.in @@ -292,6 +292,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_data2d_grib2/Makefile.in b/src/libcode/vx_data2d_grib2/Makefile.in index 60aa0172fe..dfd1d04a0e 100644 --- a/src/libcode/vx_data2d_grib2/Makefile.in +++ b/src/libcode/vx_data2d_grib2/Makefile.in @@ -285,6 +285,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_data2d_nc_met/Makefile.in b/src/libcode/vx_data2d_nc_met/Makefile.in index 1b1e5383c7..f531836763 100644 --- a/src/libcode/vx_data2d_nc_met/Makefile.in +++ b/src/libcode/vx_data2d_nc_met/Makefile.in @@ -289,6 +289,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_data2d_nc_pinterp/Makefile.in b/src/libcode/vx_data2d_nc_pinterp/Makefile.in index 89bc962bca..30118a3160 100644 --- a/src/libcode/vx_data2d_nc_pinterp/Makefile.in +++ b/src/libcode/vx_data2d_nc_pinterp/Makefile.in @@ -290,6 +290,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_data2d_nccf/Makefile.in b/src/libcode/vx_data2d_nccf/Makefile.in index a3a0f4d0ed..04f848882b 100644 --- a/src/libcode/vx_data2d_nccf/Makefile.in +++ b/src/libcode/vx_data2d_nccf/Makefile.in @@ -286,6 +286,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_data2d_python/Makefile.in b/src/libcode/vx_data2d_python/Makefile.in index 3c467c5537..531d1bf34c 100644 --- a/src/libcode/vx_data2d_python/Makefile.in +++ b/src/libcode/vx_data2d_python/Makefile.in @@ -293,6 +293,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_geodesy/Makefile.in b/src/libcode/vx_geodesy/Makefile.in index 448e181f45..b0110db2ed 100644 --- a/src/libcode/vx_geodesy/Makefile.in +++ b/src/libcode/vx_geodesy/Makefile.in @@ -281,6 +281,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_gis/Makefile.in b/src/libcode/vx_gis/Makefile.in index 7495bbd234..599ab26ab7 100644 --- a/src/libcode/vx_gis/Makefile.in +++ b/src/libcode/vx_gis/Makefile.in @@ -290,6 +290,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_gnomon/Makefile.in b/src/libcode/vx_gnomon/Makefile.in index 3ad85156d0..fe0a42cc36 100644 --- a/src/libcode/vx_gnomon/Makefile.in +++ b/src/libcode/vx_gnomon/Makefile.in @@ -281,6 +281,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_gsl_prob/Makefile.in b/src/libcode/vx_gsl_prob/Makefile.in index 28b6b34c66..f52f8dd65b 100644 --- a/src/libcode/vx_gsl_prob/Makefile.in +++ b/src/libcode/vx_gsl_prob/Makefile.in @@ -289,6 +289,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_nav/Makefile.in b/src/libcode/vx_nav/Makefile.in index e9c6000d9e..e5596245cd 100644 --- a/src/libcode/vx_nav/Makefile.in +++ b/src/libcode/vx_nav/Makefile.in @@ -281,6 +281,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_nc_obs/Makefile.in b/src/libcode/vx_nc_obs/Makefile.in index eea1f18b80..02bda4d664 100644 --- a/src/libcode/vx_nc_obs/Makefile.in +++ b/src/libcode/vx_nc_obs/Makefile.in @@ -291,6 +291,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_nc_util/Makefile.in b/src/libcode/vx_nc_util/Makefile.in index 7011be53ef..b84607d759 100644 --- a/src/libcode/vx_nc_util/Makefile.in +++ b/src/libcode/vx_nc_util/Makefile.in @@ -289,6 +289,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_pb_util/Makefile.in b/src/libcode/vx_pb_util/Makefile.in index 28d69c3aed..c0d3567d07 100644 --- a/src/libcode/vx_pb_util/Makefile.in +++ b/src/libcode/vx_pb_util/Makefile.in @@ -287,6 +287,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_physics/Makefile.in b/src/libcode/vx_physics/Makefile.in index 3cf64e206c..d4bd0e7f9c 100644 --- a/src/libcode/vx_physics/Makefile.in +++ b/src/libcode/vx_physics/Makefile.in @@ -281,6 +281,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_plot_util/Makefile.in b/src/libcode/vx_plot_util/Makefile.in index 3f15ce88ed..c2b9cf80f2 100644 --- a/src/libcode/vx_plot_util/Makefile.in +++ b/src/libcode/vx_plot_util/Makefile.in @@ -286,6 +286,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_pointdata_python/Makefile.in b/src/libcode/vx_pointdata_python/Makefile.in index f771d8b2d6..75e667811b 100644 --- a/src/libcode/vx_pointdata_python/Makefile.in +++ b/src/libcode/vx_pointdata_python/Makefile.in @@ -290,6 +290,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_ps/Makefile.in b/src/libcode/vx_ps/Makefile.in index 08d215f0c0..0644b2b031 100644 --- a/src/libcode/vx_ps/Makefile.in +++ b/src/libcode/vx_ps/Makefile.in @@ -291,6 +291,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_pxm/Makefile.in b/src/libcode/vx_pxm/Makefile.in index 330d3774f4..e6caf38b48 100644 --- a/src/libcode/vx_pxm/Makefile.in +++ b/src/libcode/vx_pxm/Makefile.in @@ -288,6 +288,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_python3_utils/Makefile.in b/src/libcode/vx_python3_utils/Makefile.in index c46bdf0b66..4a03cf717b 100644 --- a/src/libcode/vx_python3_utils/Makefile.in +++ b/src/libcode/vx_python3_utils/Makefile.in @@ -294,6 +294,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_regrid/Makefile.in b/src/libcode/vx_regrid/Makefile.in index e2c47ce6eb..37fc8142a2 100644 --- a/src/libcode/vx_regrid/Makefile.in +++ b/src/libcode/vx_regrid/Makefile.in @@ -283,6 +283,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_render/Makefile.in b/src/libcode/vx_render/Makefile.in index d1a60e05b7..dfc992afcb 100644 --- a/src/libcode/vx_render/Makefile.in +++ b/src/libcode/vx_render/Makefile.in @@ -305,6 +305,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_seeps/Makefile.in b/src/libcode/vx_seeps/Makefile.in index 6c478aac10..69cd441562 100644 --- a/src/libcode/vx_seeps/Makefile.in +++ b/src/libcode/vx_seeps/Makefile.in @@ -281,6 +281,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_series_data/Makefile.in b/src/libcode/vx_series_data/Makefile.in index f28c0cc1d0..73cdeedae3 100644 --- a/src/libcode/vx_series_data/Makefile.in +++ b/src/libcode/vx_series_data/Makefile.in @@ -284,6 +284,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_shapedata/Makefile.in b/src/libcode/vx_shapedata/Makefile.in index 3d4cd33834..9dce0a920c 100644 --- a/src/libcode/vx_shapedata/Makefile.in +++ b/src/libcode/vx_shapedata/Makefile.in @@ -297,6 +297,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_solar/Makefile.in b/src/libcode/vx_solar/Makefile.in index 7634751d27..0ac8e7f56e 100644 --- a/src/libcode/vx_solar/Makefile.in +++ b/src/libcode/vx_solar/Makefile.in @@ -283,6 +283,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_stat_out/Makefile.in b/src/libcode/vx_stat_out/Makefile.in index ec9705a279..6eeafd8560 100644 --- a/src/libcode/vx_stat_out/Makefile.in +++ b/src/libcode/vx_stat_out/Makefile.in @@ -283,6 +283,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_statistics/Makefile.in b/src/libcode/vx_statistics/Makefile.in index 974b7e3a05..c9e2ec474c 100644 --- a/src/libcode/vx_statistics/Makefile.in +++ b/src/libcode/vx_statistics/Makefile.in @@ -308,6 +308,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_summary/Makefile.in b/src/libcode/vx_summary/Makefile.in index 9c54b2d05f..afe46fb9b0 100644 --- a/src/libcode/vx_summary/Makefile.in +++ b/src/libcode/vx_summary/Makefile.in @@ -303,6 +303,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_tc_util/Makefile.in b/src/libcode/vx_tc_util/Makefile.in index 4475e10a65..3b878bf2de 100644 --- a/src/libcode/vx_tc_util/Makefile.in +++ b/src/libcode/vx_tc_util/Makefile.in @@ -317,6 +317,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_time_series/Makefile.in b/src/libcode/vx_time_series/Makefile.in index e515200d41..3b2569ee9e 100644 --- a/src/libcode/vx_time_series/Makefile.in +++ b/src/libcode/vx_time_series/Makefile.in @@ -285,6 +285,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ From a15c14d23a081c2127c69f49c80e972a98ad26ef Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 10 Oct 2023 17:22:14 -0600 Subject: [PATCH 039/109] #2574 Added UGRID_LINBS --- data/Makefile.in | 1 + data/climo/Makefile.in | 1 + data/climo/seeps/Makefile.in | 1 + data/colortables/Makefile.in | 1 + data/colortables/NCL_colortables/Makefile.in | 1 + data/config/Makefile.in | 1 + data/map/Makefile.in | 1 + data/map/admin_by_country/Makefile.in | 1 + data/poly/HMT_masks/Makefile.in | 1 + data/poly/Makefile.in | 1 + data/poly/NCEP_masks/Makefile.in | 1 + data/ps/Makefile.in | 1 + data/table_files/Makefile.in | 1 + data/tc_data/Makefile.in | 1 + 14 files changed, 14 insertions(+) diff --git a/data/Makefile.in b/data/Makefile.in index 614191d371..f28957b49b 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -307,6 +307,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/climo/Makefile.in b/data/climo/Makefile.in index caafe39670..5e3aaa588f 100644 --- a/data/climo/Makefile.in +++ b/data/climo/Makefile.in @@ -277,6 +277,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/climo/seeps/Makefile.in b/data/climo/seeps/Makefile.in index 8e67daea3b..fcb81b5b17 100644 --- a/data/climo/seeps/Makefile.in +++ b/data/climo/seeps/Makefile.in @@ -247,6 +247,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/colortables/Makefile.in b/data/colortables/Makefile.in index e38a39cbfd..57fc8c2c23 100644 --- a/data/colortables/Makefile.in +++ b/data/colortables/Makefile.in @@ -307,6 +307,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/colortables/NCL_colortables/Makefile.in b/data/colortables/NCL_colortables/Makefile.in index 7fe8a360f8..11f9f07af9 100644 --- a/data/colortables/NCL_colortables/Makefile.in +++ b/data/colortables/NCL_colortables/Makefile.in @@ -247,6 +247,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/config/Makefile.in b/data/config/Makefile.in index bae4de9257..f721b10efd 100644 --- a/data/config/Makefile.in +++ b/data/config/Makefile.in @@ -247,6 +247,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/map/Makefile.in b/data/map/Makefile.in index c793ec8acb..70a82d8136 100644 --- a/data/map/Makefile.in +++ b/data/map/Makefile.in @@ -307,6 +307,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/map/admin_by_country/Makefile.in b/data/map/admin_by_country/Makefile.in index e5521c4c14..8f6e5beaab 100644 --- a/data/map/admin_by_country/Makefile.in +++ b/data/map/admin_by_country/Makefile.in @@ -247,6 +247,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/poly/HMT_masks/Makefile.in b/data/poly/HMT_masks/Makefile.in index d7c8e28d6c..800a5866b5 100644 --- a/data/poly/HMT_masks/Makefile.in +++ b/data/poly/HMT_masks/Makefile.in @@ -247,6 +247,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/poly/Makefile.in b/data/poly/Makefile.in index 52b7a7c870..71fea185ee 100644 --- a/data/poly/Makefile.in +++ b/data/poly/Makefile.in @@ -307,6 +307,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/poly/NCEP_masks/Makefile.in b/data/poly/NCEP_masks/Makefile.in index edc7d5c139..ae30b73cad 100644 --- a/data/poly/NCEP_masks/Makefile.in +++ b/data/poly/NCEP_masks/Makefile.in @@ -247,6 +247,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/ps/Makefile.in b/data/ps/Makefile.in index d575693bfb..abcbcb1aaf 100644 --- a/data/ps/Makefile.in +++ b/data/ps/Makefile.in @@ -247,6 +247,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/table_files/Makefile.in b/data/table_files/Makefile.in index 9cc6f40af7..3c90e72952 100644 --- a/data/table_files/Makefile.in +++ b/data/table_files/Makefile.in @@ -247,6 +247,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/tc_data/Makefile.in b/data/tc_data/Makefile.in index c0ddfb498a..f17e75c336 100644 --- a/data/tc_data/Makefile.in +++ b/data/tc_data/Makefile.in @@ -247,6 +247,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ From 7e0aace5478a0d1beace4a8e8cec4dfb48b4791f Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 10 Oct 2023 17:27:11 -0600 Subject: [PATCH 040/109] #2574 Added UGRID_LIBS --- internal/test_util/Makefile.in | 1 + internal/test_util/basic/Makefile.in | 1 + internal/test_util/basic/vx_config/Makefile.in | 1 + internal/test_util/basic/vx_log/Makefile.in | 1 + internal/test_util/basic/vx_util/Makefile.in | 1 + internal/test_util/libcode/Makefile.in | 1 + internal/test_util/libcode/vx_geodesy/Makefile.in | 1 + internal/test_util/libcode/vx_nc_util/Makefile.in | 1 + internal/test_util/libcode/vx_physics/Makefile.in | 1 + internal/test_util/libcode/vx_plot_util/Makefile.in | 1 + internal/test_util/libcode/vx_ps/Makefile.in | 1 + internal/test_util/libcode/vx_series_data/Makefile.in | 1 + internal/test_util/libcode/vx_solar/Makefile.in | 1 + internal/test_util/libcode/vx_tc_util/Makefile.in | 1 + internal/test_util/tools/Makefile.in | 1 + internal/test_util/tools/other/Makefile.in | 1 + 16 files changed, 16 insertions(+) diff --git a/internal/test_util/Makefile.in b/internal/test_util/Makefile.in index 74888dad40..14047af2d0 100644 --- a/internal/test_util/Makefile.in +++ b/internal/test_util/Makefile.in @@ -277,6 +277,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/basic/Makefile.in b/internal/test_util/basic/Makefile.in index 10ba1f6e7c..ce2b774b89 100644 --- a/internal/test_util/basic/Makefile.in +++ b/internal/test_util/basic/Makefile.in @@ -277,6 +277,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/basic/vx_config/Makefile.in b/internal/test_util/basic/vx_config/Makefile.in index 0285cb4d04..fe650070e1 100644 --- a/internal/test_util/basic/vx_config/Makefile.in +++ b/internal/test_util/basic/vx_config/Makefile.in @@ -302,6 +302,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/basic/vx_log/Makefile.in b/internal/test_util/basic/vx_log/Makefile.in index add245c3cc..069844e9d4 100644 --- a/internal/test_util/basic/vx_log/Makefile.in +++ b/internal/test_util/basic/vx_log/Makefile.in @@ -271,6 +271,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/basic/vx_util/Makefile.in b/internal/test_util/basic/vx_util/Makefile.in index a840e025e2..44774d077e 100644 --- a/internal/test_util/basic/vx_util/Makefile.in +++ b/internal/test_util/basic/vx_util/Makefile.in @@ -307,6 +307,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/libcode/Makefile.in b/internal/test_util/libcode/Makefile.in index 3514c90ed9..dcc04f5782 100644 --- a/internal/test_util/libcode/Makefile.in +++ b/internal/test_util/libcode/Makefile.in @@ -277,6 +277,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/libcode/vx_geodesy/Makefile.in b/internal/test_util/libcode/vx_geodesy/Makefile.in index c8ab53472e..5c07f60017 100644 --- a/internal/test_util/libcode/vx_geodesy/Makefile.in +++ b/internal/test_util/libcode/vx_geodesy/Makefile.in @@ -265,6 +265,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/libcode/vx_nc_util/Makefile.in b/internal/test_util/libcode/vx_nc_util/Makefile.in index af88cc911e..db82a5f634 100644 --- a/internal/test_util/libcode/vx_nc_util/Makefile.in +++ b/internal/test_util/libcode/vx_nc_util/Makefile.in @@ -270,6 +270,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/libcode/vx_physics/Makefile.in b/internal/test_util/libcode/vx_physics/Makefile.in index d143950ec0..7968a41c33 100644 --- a/internal/test_util/libcode/vx_physics/Makefile.in +++ b/internal/test_util/libcode/vx_physics/Makefile.in @@ -265,6 +265,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/libcode/vx_plot_util/Makefile.in b/internal/test_util/libcode/vx_plot_util/Makefile.in index 124ef8267a..b912fe44ae 100644 --- a/internal/test_util/libcode/vx_plot_util/Makefile.in +++ b/internal/test_util/libcode/vx_plot_util/Makefile.in @@ -266,6 +266,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/libcode/vx_ps/Makefile.in b/internal/test_util/libcode/vx_ps/Makefile.in index 9504c16408..4d856d8a3b 100644 --- a/internal/test_util/libcode/vx_ps/Makefile.in +++ b/internal/test_util/libcode/vx_ps/Makefile.in @@ -265,6 +265,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/libcode/vx_series_data/Makefile.in b/internal/test_util/libcode/vx_series_data/Makefile.in index 96a4853479..86a55fafbc 100644 --- a/internal/test_util/libcode/vx_series_data/Makefile.in +++ b/internal/test_util/libcode/vx_series_data/Makefile.in @@ -267,6 +267,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/libcode/vx_solar/Makefile.in b/internal/test_util/libcode/vx_solar/Makefile.in index 8251c7948c..e82111c3f1 100644 --- a/internal/test_util/libcode/vx_solar/Makefile.in +++ b/internal/test_util/libcode/vx_solar/Makefile.in @@ -265,6 +265,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/libcode/vx_tc_util/Makefile.in b/internal/test_util/libcode/vx_tc_util/Makefile.in index a4a1f5c0c7..e834361439 100644 --- a/internal/test_util/libcode/vx_tc_util/Makefile.in +++ b/internal/test_util/libcode/vx_tc_util/Makefile.in @@ -275,6 +275,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/tools/Makefile.in b/internal/test_util/tools/Makefile.in index 3d6548c6b4..4a8f44754e 100644 --- a/internal/test_util/tools/Makefile.in +++ b/internal/test_util/tools/Makefile.in @@ -277,6 +277,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/tools/other/Makefile.in b/internal/test_util/tools/other/Makefile.in index 4a79bd205f..84f48b3d67 100644 --- a/internal/test_util/tools/other/Makefile.in +++ b/internal/test_util/tools/other/Makefile.in @@ -277,6 +277,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ From 11bed9a1977401ec6b1f89c2024da15c889d8bdd Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 10 Oct 2023 17:29:45 -0600 Subject: [PATCH 041/109] #2574 Made vx_data2d_ugrid conditional --- src/libcode/Makefile.am | 6 ++++-- src/libcode/Makefile.in | 22 ++++++++++++---------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/libcode/Makefile.am b/src/libcode/Makefile.am index e53020ed8a..e20f67551a 100644 --- a/src/libcode/Makefile.am +++ b/src/libcode/Makefile.am @@ -22,7 +22,6 @@ SUBDIRS = vx_grid \ vx_data2d_grib \ vx_data2d_nc_met \ vx_data2d_nccf \ - vx_data2d_ugrid \ vx_data2d_nc_pinterp if ENABLE_PYTHON @@ -31,11 +30,14 @@ if ENABLE_PYTHON SUBDIRS += vx_pointdata_python endif - if ENABLE_GRIB2 SUBDIRS += vx_data2d_grib2 endif +if ENABLE_UGRID + SUBDIRS += vx_data2d_ugrid +endif + SUBDIRS += vx_data2d_factory \ vx_gsl_prob \ vx_gnomon \ diff --git a/src/libcode/Makefile.in b/src/libcode/Makefile.in index abfb5fd571..e5ad4aaac4 100644 --- a/src/libcode/Makefile.in +++ b/src/libcode/Makefile.in @@ -90,6 +90,7 @@ host_triplet = @host@ @ENABLE_PYTHON_TRUE@am__append_1 = vx_python3_utils vx_data2d_python \ @ENABLE_PYTHON_TRUE@ vx_pointdata_python @ENABLE_GRIB2_TRUE@am__append_2 = vx_data2d_grib2 +@ENABLE_UGRID_TRUE@am__append_3 = vx_data2d_ugrid subdir = src/libcode ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -155,14 +156,14 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = vx_grid vx_data2d vx_nc_util vx_data2d_grib \ - vx_data2d_nc_met vx_data2d_nccf vx_data2d_ugrid \ - vx_data2d_nc_pinterp vx_python3_utils vx_data2d_python \ - vx_pointdata_python vx_data2d_grib2 vx_data2d_factory \ - vx_gsl_prob vx_gnomon vx_geodesy vx_gis vx_nav vx_pb_util \ - vx_afm vx_color vx_pxm vx_render vx_ps vx_plot_util \ - vx_shapedata vx_statistics vx_stat_out vx_analysis_util \ - vx_tc_util vx_summary vx_time_series vx_physics vx_series_data \ - vx_regrid vx_nc_obs vx_solar vx_bool_calc vx_seeps + vx_data2d_nc_met vx_data2d_nccf vx_data2d_nc_pinterp \ + vx_python3_utils vx_data2d_python vx_pointdata_python \ + vx_data2d_grib2 vx_data2d_ugrid vx_data2d_factory vx_gsl_prob \ + vx_gnomon vx_geodesy vx_gis vx_nav vx_pb_util vx_afm vx_color \ + vx_pxm vx_render vx_ps vx_plot_util vx_shapedata vx_statistics \ + vx_stat_out vx_analysis_util vx_tc_util vx_summary \ + vx_time_series vx_physics vx_series_data vx_regrid vx_nc_obs \ + vx_solar vx_bool_calc vx_seeps am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ @@ -288,6 +289,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -345,8 +347,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = vx_grid vx_data2d vx_nc_util vx_data2d_grib vx_data2d_nc_met \ - vx_data2d_nccf vx_data2d_ugrid vx_data2d_nc_pinterp \ - $(am__append_1) $(am__append_2) vx_data2d_factory vx_gsl_prob \ + vx_data2d_nccf vx_data2d_nc_pinterp $(am__append_1) \ + $(am__append_2) $(am__append_3) vx_data2d_factory vx_gsl_prob \ vx_gnomon vx_geodesy vx_gis vx_nav vx_pb_util vx_afm vx_color \ vx_pxm vx_render vx_ps vx_plot_util vx_shapedata vx_statistics \ vx_stat_out vx_analysis_util vx_tc_util vx_summary \ From c72837a5c24a6c4209699bd0172163590fdce773 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 10 Oct 2023 17:30:15 -0600 Subject: [PATCH 042/109] #2474 Added UGRID_LIBS --- src/libcode/vx_data2d_factory/Makefile.in | 1 + src/libcode/vx_data2d_ugrid/Makefile.in | 1 + 2 files changed, 2 insertions(+) diff --git a/src/libcode/vx_data2d_factory/Makefile.in b/src/libcode/vx_data2d_factory/Makefile.in index cd89907d00..b7c12004d2 100644 --- a/src/libcode/vx_data2d_factory/Makefile.in +++ b/src/libcode/vx_data2d_factory/Makefile.in @@ -295,6 +295,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_data2d_ugrid/Makefile.in b/src/libcode/vx_data2d_ugrid/Makefile.in index 8ed3146c4b..cb9cc10e2a 100644 --- a/src/libcode/vx_data2d_ugrid/Makefile.in +++ b/src/libcode/vx_data2d_ugrid/Makefile.in @@ -287,6 +287,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ From 4298f5499fb62c643d99cb5bcef1c92494a92d90 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 10 Oct 2023 17:32:41 -0600 Subject: [PATCH 043/109] #2574 Replaced libraries with UGRID_LIBS --- src/tools/Makefile.in | 1 + src/tools/core/Makefile.in | 1 + src/tools/core/ensemble_stat/Makefile.am | 2 +- src/tools/core/ensemble_stat/Makefile.in | 6 ++++-- src/tools/core/grid_stat/Makefile.am | 2 +- src/tools/core/grid_stat/Makefile.in | 6 ++++-- src/tools/core/mode/Makefile.am | 2 +- src/tools/core/mode/Makefile.in | 6 ++++-- src/tools/core/mode_analysis/Makefile.am | 2 +- src/tools/core/mode_analysis/Makefile.in | 6 ++++-- src/tools/core/pcp_combine/Makefile.am | 2 +- src/tools/core/pcp_combine/Makefile.in | 6 ++++-- src/tools/core/point_stat/Makefile.am | 2 +- src/tools/core/point_stat/Makefile.in | 5 +++-- src/tools/core/series_analysis/Makefile.am | 2 +- src/tools/core/series_analysis/Makefile.in | 5 +++-- src/tools/core/stat_analysis/Makefile.am | 2 +- src/tools/core/stat_analysis/Makefile.in | 5 +++-- src/tools/core/wavelet_stat/Makefile.am | 2 +- src/tools/core/wavelet_stat/Makefile.in | 5 +++-- src/tools/dev_utils/Makefile.am | 2 +- src/tools/dev_utils/Makefile.in | 5 +++-- src/tools/dev_utils/shapefiles/Makefile.in | 1 + src/tools/other/Makefile.in | 1 + src/tools/other/ascii2nc/Makefile.am | 2 +- src/tools/other/ascii2nc/Makefile.in | 5 +++-- src/tools/other/gen_ens_prod/Makefile.am | 2 +- src/tools/other/gen_ens_prod/Makefile.in | 6 ++++-- src/tools/other/gen_vx_mask/Makefile.am | 2 +- src/tools/other/gen_vx_mask/Makefile.in | 6 ++++-- src/tools/other/gis_utils/Makefile.in | 1 + src/tools/other/grid_diag/Makefile.am | 2 +- src/tools/other/grid_diag/Makefile.in | 6 ++++-- src/tools/other/gsi_tools/Makefile.am | 4 ++-- src/tools/other/gsi_tools/Makefile.in | 10 ++++++---- src/tools/other/ioda2nc/Makefile.am | 2 +- src/tools/other/ioda2nc/Makefile.in | 6 ++++-- src/tools/other/lidar2nc/Makefile.am | 2 +- src/tools/other/lidar2nc/Makefile.in | 6 ++++-- src/tools/other/madis2nc/Makefile.am | 2 +- src/tools/other/madis2nc/Makefile.in | 5 +++-- src/tools/other/mode_graphics/Makefile.am | 2 +- src/tools/other/mode_graphics/Makefile.in | 6 ++++-- src/tools/other/mode_time_domain/Makefile.am | 2 +- src/tools/other/mode_time_domain/Makefile.in | 6 ++++-- src/tools/other/modis_regrid/Makefile.am | 2 +- src/tools/other/modis_regrid/Makefile.in | 5 +++-- src/tools/other/pb2nc/Makefile.am | 2 +- src/tools/other/pb2nc/Makefile.in | 7 ++++--- src/tools/other/plot_data_plane/Makefile.am | 2 +- src/tools/other/plot_data_plane/Makefile.in | 5 +++-- src/tools/other/plot_point_obs/Makefile.am | 2 +- src/tools/other/plot_point_obs/Makefile.in | 6 ++++-- src/tools/other/point2grid/Makefile.am | 2 +- src/tools/other/point2grid/Makefile.in | 5 +++-- src/tools/other/regrid_data_plane/Makefile.am | 2 +- src/tools/other/regrid_data_plane/Makefile.in | 5 +++-- src/tools/other/shift_data_plane/Makefile.am | 2 +- src/tools/other/shift_data_plane/Makefile.in | 5 +++-- src/tools/other/wwmca_tool/Makefile.am | 4 ++-- src/tools/other/wwmca_tool/Makefile.in | 10 ++++++---- src/tools/tc_utils/Makefile.in | 1 + src/tools/tc_utils/rmw_analysis/Makefile.am | 2 +- src/tools/tc_utils/rmw_analysis/Makefile.in | 6 ++++-- src/tools/tc_utils/tc_diag/Makefile.am | 2 +- src/tools/tc_utils/tc_diag/Makefile.in | 5 +++-- src/tools/tc_utils/tc_dland/Makefile.am | 2 +- src/tools/tc_utils/tc_dland/Makefile.in | 5 +++-- src/tools/tc_utils/tc_gen/Makefile.am | 2 +- src/tools/tc_utils/tc_gen/Makefile.in | 5 +++-- src/tools/tc_utils/tc_pairs/Makefile.am | 2 +- src/tools/tc_utils/tc_pairs/Makefile.in | 5 +++-- src/tools/tc_utils/tc_rmw/Makefile.am | 2 +- src/tools/tc_utils/tc_rmw/Makefile.in | 5 +++-- src/tools/tc_utils/tc_stat/Makefile.am | 2 +- src/tools/tc_utils/tc_stat/Makefile.in | 6 ++++-- 76 files changed, 170 insertions(+), 112 deletions(-) diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in index e3c77abd53..569cbcbcb0 100644 --- a/src/tools/Makefile.in +++ b/src/tools/Makefile.in @@ -279,6 +279,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/core/Makefile.in b/src/tools/core/Makefile.in index cf6a4aeacc..f95c75793d 100644 --- a/src/tools/core/Makefile.in +++ b/src/tools/core/Makefile.in @@ -287,6 +287,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/core/ensemble_stat/Makefile.am b/src/tools/core/ensemble_stat/Makefile.am index d2edff9a27..e3bbed953c 100644 --- a/src/tools/core/ensemble_stat/Makefile.am +++ b/src/tools/core/ensemble_stat/Makefile.am @@ -25,7 +25,7 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/core/ensemble_stat/Makefile.in b/src/tools/core/ensemble_stat/Makefile.in index e4c4e70fec..ed7f377cbb 100644 --- a/src/tools/core/ensemble_stat/Makefile.in +++ b/src/tools/core/ensemble_stat/Makefile.in @@ -106,7 +106,8 @@ am_ensemble_stat_OBJECTS = ensemble_stat-ensemble_stat.$(OBJEXT) \ ensemble_stat_OBJECTS = $(am_ensemble_stat_OBJECTS) am__DEPENDENCIES_1 = ensemble_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) ensemble_stat_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(ensemble_stat_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +271,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -342,7 +344,7 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/core/grid_stat/Makefile.am b/src/tools/core/grid_stat/Makefile.am index d6bcf022d9..fd5fc5ab9b 100644 --- a/src/tools/core/grid_stat/Makefile.am +++ b/src/tools/core/grid_stat/Makefile.am @@ -26,7 +26,7 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/grid_stat/Makefile.in b/src/tools/core/grid_stat/Makefile.in index ca963b5493..c5b8b42427 100644 --- a/src/tools/core/grid_stat/Makefile.in +++ b/src/tools/core/grid_stat/Makefile.in @@ -105,7 +105,8 @@ am_grid_stat_OBJECTS = grid_stat-grid_stat.$(OBJEXT) \ grid_stat-grid_stat_conf_info.$(OBJEXT) grid_stat_OBJECTS = $(am_grid_stat_OBJECTS) am__DEPENDENCIES_1 = -grid_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +grid_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) grid_stat_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(grid_stat_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -269,6 +270,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -342,7 +344,7 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/mode/Makefile.am b/src/tools/core/mode/Makefile.am index 70bbaf552d..a80f2fc12e 100644 --- a/src/tools/core/mode/Makefile.am +++ b/src/tools/core/mode/Makefile.am @@ -45,7 +45,7 @@ mode_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/mode/Makefile.in b/src/tools/core/mode/Makefile.in index 02ae7f6991..2a9b828999 100644 --- a/src/tools/core/mode/Makefile.in +++ b/src/tools/core/mode/Makefile.in @@ -112,7 +112,8 @@ am_mode_OBJECTS = mode-mode_usage.$(OBJEXT) \ mode-overlap_page.$(OBJEXT) mode-mode_exec.$(OBJEXT) mode_OBJECTS = $(am_mode_OBJECTS) am__DEPENDENCIES_1 = -mode_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +mode_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) mode_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(mode_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -287,6 +288,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -379,7 +381,7 @@ mode_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/mode_analysis/Makefile.am b/src/tools/core/mode_analysis/Makefile.am index 0611f87b30..e3a27adeed 100644 --- a/src/tools/core/mode_analysis/Makefile.am +++ b/src/tools/core/mode_analysis/Makefile.am @@ -29,7 +29,7 @@ mode_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/core/mode_analysis/Makefile.in b/src/tools/core/mode_analysis/Makefile.in index 4510213632..7ac8f113a0 100644 --- a/src/tools/core/mode_analysis/Makefile.in +++ b/src/tools/core/mode_analysis/Makefile.in @@ -106,7 +106,8 @@ am_mode_analysis_OBJECTS = mode_analysis-mode_analysis.$(OBJEXT) \ mode_analysis_OBJECTS = $(am_mode_analysis_OBJECTS) am__DEPENDENCIES_1 = mode_analysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) mode_analysis_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(mode_analysis_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +271,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -346,7 +348,7 @@ mode_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/core/pcp_combine/Makefile.am b/src/tools/core/pcp_combine/Makefile.am index d9205bfcf9..1059c3d4ad 100644 --- a/src/tools/core/pcp_combine/Makefile.am +++ b/src/tools/core/pcp_combine/Makefile.am @@ -20,7 +20,7 @@ pcp_combine_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/core/pcp_combine/Makefile.in b/src/tools/core/pcp_combine/Makefile.in index c5590eec67..b6bd2ada9a 100644 --- a/src/tools/core/pcp_combine/Makefile.in +++ b/src/tools/core/pcp_combine/Makefile.in @@ -104,7 +104,8 @@ PROGRAMS = $(bin_PROGRAMS) am_pcp_combine_OBJECTS = pcp_combine-pcp_combine.$(OBJEXT) pcp_combine_OBJECTS = $(am_pcp_combine_OBJECTS) am__DEPENDENCIES_1 = -pcp_combine_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +pcp_combine_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) pcp_combine_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(pcp_combine_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -267,6 +268,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -333,7 +335,7 @@ pcp_combine_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/core/point_stat/Makefile.am b/src/tools/core/point_stat/Makefile.am index c9f3a47f7e..9c0bbbfe50 100644 --- a/src/tools/core/point_stat/Makefile.am +++ b/src/tools/core/point_stat/Makefile.am @@ -24,7 +24,7 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/core/point_stat/Makefile.in b/src/tools/core/point_stat/Makefile.in index 610f61f98d..9822e7b04c 100644 --- a/src/tools/core/point_stat/Makefile.in +++ b/src/tools/core/point_stat/Makefile.in @@ -106,7 +106,7 @@ am_point_stat_OBJECTS = point_stat-point_stat.$(OBJEXT) \ point_stat_OBJECTS = $(am_point_stat_OBJECTS) am__DEPENDENCIES_1 = point_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) point_stat_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(point_stat_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +270,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -341,7 +342,7 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/core/series_analysis/Makefile.am b/src/tools/core/series_analysis/Makefile.am index 82b0532e88..1137a3e76c 100644 --- a/src/tools/core/series_analysis/Makefile.am +++ b/src/tools/core/series_analysis/Makefile.am @@ -26,7 +26,7 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/series_analysis/Makefile.in b/src/tools/core/series_analysis/Makefile.in index c73af62d40..dc41156a30 100644 --- a/src/tools/core/series_analysis/Makefile.in +++ b/src/tools/core/series_analysis/Makefile.in @@ -107,7 +107,7 @@ am_series_analysis_OBJECTS = \ series_analysis_OBJECTS = $(am_series_analysis_OBJECTS) am__DEPENDENCIES_1 = series_analysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) series_analysis_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(series_analysis_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -271,6 +271,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -344,7 +345,7 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/stat_analysis/Makefile.am b/src/tools/core/stat_analysis/Makefile.am index f5ad4be10a..126538a295 100644 --- a/src/tools/core/stat_analysis/Makefile.am +++ b/src/tools/core/stat_analysis/Makefile.am @@ -29,7 +29,7 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/stat_analysis/Makefile.in b/src/tools/core/stat_analysis/Makefile.in index 4ebcf62d97..aede96c476 100644 --- a/src/tools/core/stat_analysis/Makefile.in +++ b/src/tools/core/stat_analysis/Makefile.in @@ -109,7 +109,7 @@ am_stat_analysis_OBJECTS = stat_analysis-stat_analysis.$(OBJEXT) \ stat_analysis_OBJECTS = $(am_stat_analysis_OBJECTS) am__DEPENDENCIES_1 = stat_analysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) stat_analysis_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(stat_analysis_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -276,6 +276,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -352,7 +353,7 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/wavelet_stat/Makefile.am b/src/tools/core/wavelet_stat/Makefile.am index f827007742..6d9e6f2cf7 100644 --- a/src/tools/core/wavelet_stat/Makefile.am +++ b/src/tools/core/wavelet_stat/Makefile.am @@ -32,7 +32,7 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/wavelet_stat/Makefile.in b/src/tools/core/wavelet_stat/Makefile.in index ce2ace46d7..42a70d6820 100644 --- a/src/tools/core/wavelet_stat/Makefile.in +++ b/src/tools/core/wavelet_stat/Makefile.in @@ -106,7 +106,7 @@ am_wavelet_stat_OBJECTS = wavelet_stat-wavelet_stat.$(OBJEXT) \ wavelet_stat_OBJECTS = $(am_wavelet_stat_OBJECTS) am__DEPENDENCIES_1 = wavelet_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) wavelet_stat_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(wavelet_stat_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +270,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -349,7 +350,7 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/dev_utils/Makefile.am b/src/tools/dev_utils/Makefile.am index 4dd98cadf6..dbba4d21ee 100644 --- a/src/tools/dev_utils/Makefile.am +++ b/src/tools/dev_utils/Makefile.am @@ -128,7 +128,7 @@ gen_climo_bin_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/dev_utils/Makefile.in b/src/tools/dev_utils/Makefile.in index 113a0bcbac..7fb6c01b19 100644 --- a/src/tools/dev_utils/Makefile.in +++ b/src/tools/dev_utils/Makefile.in @@ -114,7 +114,7 @@ am_gen_climo_bin_OBJECTS = gen_climo_bin-gen_climo_bin.$(OBJEXT) gen_climo_bin_OBJECTS = $(am_gen_climo_bin_OBJECTS) am__DEPENDENCIES_1 = gen_climo_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) gen_climo_bin_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(gen_climo_bin_LDFLAGS) $(LDFLAGS) -o $@ am__dirstamp = $(am__leading_dot)dirstamp @@ -413,6 +413,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -578,7 +579,7 @@ gen_climo_bin_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/dev_utils/shapefiles/Makefile.in b/src/tools/dev_utils/shapefiles/Makefile.in index aa75ce2c42..1b46cfee11 100644 --- a/src/tools/dev_utils/shapefiles/Makefile.in +++ b/src/tools/dev_utils/shapefiles/Makefile.in @@ -266,6 +266,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/other/Makefile.in b/src/tools/other/Makefile.in index 1142dca82c..10c4136178 100644 --- a/src/tools/other/Makefile.in +++ b/src/tools/other/Makefile.in @@ -299,6 +299,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/other/ascii2nc/Makefile.am b/src/tools/other/ascii2nc/Makefile.am index 3c4beb9904..777a60c576 100644 --- a/src/tools/other/ascii2nc/Makefile.am +++ b/src/tools/other/ascii2nc/Makefile.am @@ -41,7 +41,7 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/ascii2nc/Makefile.in b/src/tools/other/ascii2nc/Makefile.in index a1c6ddbaff..49b049017b 100644 --- a/src/tools/other/ascii2nc/Makefile.in +++ b/src/tools/other/ascii2nc/Makefile.in @@ -128,7 +128,7 @@ am_ascii2nc_OBJECTS = ascii2nc-ascii2nc.$(OBJEXT) \ ascii2nc_OBJECTS = $(am_ascii2nc_OBJECTS) am__DEPENDENCIES_1 = ascii2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ascii2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(ascii2nc_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -315,6 +315,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -397,7 +398,7 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/gen_ens_prod/Makefile.am b/src/tools/other/gen_ens_prod/Makefile.am index 740a258b7e..e1d6c399d5 100644 --- a/src/tools/other/gen_ens_prod/Makefile.am +++ b/src/tools/other/gen_ens_prod/Makefile.am @@ -25,7 +25,7 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/gen_ens_prod/Makefile.in b/src/tools/other/gen_ens_prod/Makefile.in index 970cb07870..e61445a98d 100644 --- a/src/tools/other/gen_ens_prod/Makefile.in +++ b/src/tools/other/gen_ens_prod/Makefile.in @@ -106,7 +106,8 @@ am_gen_ens_prod_OBJECTS = gen_ens_prod-gen_ens_prod.$(OBJEXT) \ gen_ens_prod_OBJECTS = $(am_gen_ens_prod_OBJECTS) am__DEPENDENCIES_1 = gen_ens_prod_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) gen_ens_prod_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(gen_ens_prod_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +271,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -342,7 +344,7 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/gen_vx_mask/Makefile.am b/src/tools/other/gen_vx_mask/Makefile.am index c3206a3264..5daca1fbf9 100644 --- a/src/tools/other/gen_vx_mask/Makefile.am +++ b/src/tools/other/gen_vx_mask/Makefile.am @@ -22,7 +22,7 @@ gen_vx_mask_LDADD = -lvx_shapedata \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_gis \ diff --git a/src/tools/other/gen_vx_mask/Makefile.in b/src/tools/other/gen_vx_mask/Makefile.in index fd9d0ba39a..4003ad1c17 100644 --- a/src/tools/other/gen_vx_mask/Makefile.in +++ b/src/tools/other/gen_vx_mask/Makefile.in @@ -104,7 +104,8 @@ PROGRAMS = $(bin_PROGRAMS) am_gen_vx_mask_OBJECTS = gen_vx_mask-gen_vx_mask.$(OBJEXT) gen_vx_mask_OBJECTS = $(am_gen_vx_mask_OBJECTS) am__DEPENDENCIES_1 = -gen_vx_mask_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +gen_vx_mask_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) gen_vx_mask_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(gen_vx_mask_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -267,6 +268,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -334,7 +336,7 @@ gen_vx_mask_LDADD = -lvx_shapedata \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_gis \ diff --git a/src/tools/other/gis_utils/Makefile.in b/src/tools/other/gis_utils/Makefile.in index c43a62c46a..ef269df9c6 100644 --- a/src/tools/other/gis_utils/Makefile.in +++ b/src/tools/other/gis_utils/Makefile.in @@ -281,6 +281,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/other/grid_diag/Makefile.am b/src/tools/other/grid_diag/Makefile.am index ad48185c29..b1b2a04e49 100644 --- a/src/tools/other/grid_diag/Makefile.am +++ b/src/tools/other/grid_diag/Makefile.am @@ -26,7 +26,7 @@ grid_diag_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/grid_diag/Makefile.in b/src/tools/other/grid_diag/Makefile.in index b640eab070..e350a6a9f9 100644 --- a/src/tools/other/grid_diag/Makefile.in +++ b/src/tools/other/grid_diag/Makefile.in @@ -105,7 +105,8 @@ am_grid_diag_OBJECTS = grid_diag-grid_diag.$(OBJEXT) \ grid_diag-grid_diag_conf_info.$(OBJEXT) grid_diag_OBJECTS = $(am_grid_diag_OBJECTS) am__DEPENDENCIES_1 = -grid_diag_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +grid_diag_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) grid_diag_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(grid_diag_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -269,6 +270,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -342,7 +344,7 @@ grid_diag_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/gsi_tools/Makefile.am b/src/tools/other/gsi_tools/Makefile.am index d7fec0a689..a0a76cb940 100644 --- a/src/tools/other/gsi_tools/Makefile.am +++ b/src/tools/other/gsi_tools/Makefile.am @@ -45,7 +45,7 @@ gsid2mpr_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_seeps \ -lvx_nc_util \ @@ -95,7 +95,7 @@ gsidens2orank_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_seeps \ -lvx_nc_util \ diff --git a/src/tools/other/gsi_tools/Makefile.in b/src/tools/other/gsi_tools/Makefile.in index 6f9f8c2fe9..835ea4146c 100644 --- a/src/tools/other/gsi_tools/Makefile.in +++ b/src/tools/other/gsi_tools/Makefile.in @@ -108,7 +108,7 @@ am_gsid2mpr_OBJECTS = gsid2mpr-gsi_record.$(OBJEXT) \ gsid2mpr_OBJECTS = $(am_gsid2mpr_OBJECTS) am__DEPENDENCIES_1 = gsid2mpr_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) gsid2mpr_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(gsid2mpr_LDFLAGS) $(LDFLAGS) -o $@ am_gsidens2orank_OBJECTS = gsidens2orank-gsi_record.$(OBJEXT) \ @@ -119,7 +119,8 @@ am_gsidens2orank_OBJECTS = gsidens2orank-gsi_record.$(OBJEXT) \ gsidens2orank-rad_config.$(OBJEXT) gsidens2orank_OBJECTS = $(am_gsidens2orank_OBJECTS) gsidens2orank_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) gsidens2orank_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(gsidens2orank_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -305,6 +306,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -395,7 +397,7 @@ gsid2mpr_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_seeps \ -lvx_nc_util \ @@ -446,7 +448,7 @@ gsidens2orank_LDADD = -lvx_stat_out \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_seeps \ -lvx_nc_util \ diff --git a/src/tools/other/ioda2nc/Makefile.am b/src/tools/other/ioda2nc/Makefile.am index b5cf633a54..d34bd36eb5 100644 --- a/src/tools/other/ioda2nc/Makefile.am +++ b/src/tools/other/ioda2nc/Makefile.am @@ -24,7 +24,7 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/ioda2nc/Makefile.in b/src/tools/other/ioda2nc/Makefile.in index 3e5d657e88..9572c8b526 100644 --- a/src/tools/other/ioda2nc/Makefile.in +++ b/src/tools/other/ioda2nc/Makefile.in @@ -106,7 +106,8 @@ am_ioda2nc_OBJECTS = ioda2nc-ioda2nc.$(OBJEXT) \ ioda2nc_OBJECTS = $(am_ioda2nc_OBJECTS) am__DEPENDENCIES_1 = ioda2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) ioda2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(ioda2nc_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -282,6 +283,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -353,7 +355,7 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/lidar2nc/Makefile.am b/src/tools/other/lidar2nc/Makefile.am index f13e1dac80..0bbe09fb4f 100644 --- a/src/tools/other/lidar2nc/Makefile.am +++ b/src/tools/other/lidar2nc/Makefile.am @@ -26,7 +26,7 @@ lidar2nc_LDADD = -lvx_shapedata \ -lvx_data2d_nc_met \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_nc_obs \ -lvx_nc_util \ diff --git a/src/tools/other/lidar2nc/Makefile.in b/src/tools/other/lidar2nc/Makefile.in index 9b1f62318e..001f3bb6bd 100644 --- a/src/tools/other/lidar2nc/Makefile.in +++ b/src/tools/other/lidar2nc/Makefile.in @@ -105,7 +105,8 @@ am_lidar2nc_OBJECTS = lidar2nc-lidar2nc.$(OBJEXT) \ lidar2nc-hdf_utils.$(OBJEXT) lidar2nc-calipso_5km.$(OBJEXT) lidar2nc_OBJECTS = $(am_lidar2nc_OBJECTS) am__DEPENDENCIES_1 = -lidar2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +lidar2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) lidar2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(lidar2nc_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -282,6 +283,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -356,7 +358,7 @@ lidar2nc_LDADD = -lvx_shapedata \ -lvx_data2d_nc_met \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_nc_obs \ -lvx_nc_util \ diff --git a/src/tools/other/madis2nc/Makefile.am b/src/tools/other/madis2nc/Makefile.am index feb1cc0c4d..9176924ec0 100644 --- a/src/tools/other/madis2nc/Makefile.am +++ b/src/tools/other/madis2nc/Makefile.am @@ -23,7 +23,7 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/madis2nc/Makefile.in b/src/tools/other/madis2nc/Makefile.in index 0d35e5978a..26730279bd 100644 --- a/src/tools/other/madis2nc/Makefile.in +++ b/src/tools/other/madis2nc/Makefile.in @@ -106,7 +106,7 @@ am_madis2nc_OBJECTS = madis2nc-madis2nc.$(OBJEXT) \ madis2nc_OBJECTS = $(am_madis2nc_OBJECTS) am__DEPENDENCIES_1 = madis2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) madis2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(madis2nc_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +270,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -339,7 +340,7 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/mode_graphics/Makefile.am b/src/tools/other/mode_graphics/Makefile.am index 6773629974..7b6625f885 100644 --- a/src/tools/other/mode_graphics/Makefile.am +++ b/src/tools/other/mode_graphics/Makefile.am @@ -26,7 +26,7 @@ plot_mode_field_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_plot_util \ -lvx_data2d_nc_met \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_grid \ diff --git a/src/tools/other/mode_graphics/Makefile.in b/src/tools/other/mode_graphics/Makefile.in index f0c50cee76..393377df71 100644 --- a/src/tools/other/mode_graphics/Makefile.in +++ b/src/tools/other/mode_graphics/Makefile.in @@ -110,7 +110,8 @@ am_plot_mode_field_OBJECTS = \ plot_mode_field-mode_nc_output_file.$(OBJEXT) plot_mode_field_OBJECTS = $(am_plot_mode_field_OBJECTS) am__DEPENDENCIES_1 = -plot_mode_field_DEPENDENCIES = $(am__DEPENDENCIES_1) +plot_mode_field_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) plot_mode_field_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(plot_mode_field_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -290,6 +291,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -362,7 +364,7 @@ plot_mode_field_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_plot_util \ -lvx_data2d_nc_met \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_grid \ diff --git a/src/tools/other/mode_time_domain/Makefile.am b/src/tools/other/mode_time_domain/Makefile.am index 7c6bb4392d..2ec931dccc 100644 --- a/src/tools/other/mode_time_domain/Makefile.am +++ b/src/tools/other/mode_time_domain/Makefile.am @@ -55,7 +55,7 @@ mtd_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/mode_time_domain/Makefile.in b/src/tools/other/mode_time_domain/Makefile.in index 05e2c0692a..0976829a62 100644 --- a/src/tools/other/mode_time_domain/Makefile.in +++ b/src/tools/other/mode_time_domain/Makefile.in @@ -116,7 +116,8 @@ am_mtd_OBJECTS = mtd-mtd.$(OBJEXT) mtd-mtdfiletype_to_string.$(OBJEXT) \ mtd-mm_engine.$(OBJEXT) mtd_OBJECTS = $(am_mtd_OBJECTS) am__DEPENDENCIES_1 = -mtd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +mtd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) mtd_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(mtd_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -308,6 +309,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -411,7 +413,7 @@ mtd_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/modis_regrid/Makefile.am b/src/tools/other/modis_regrid/Makefile.am index 8b16557c9c..3015d3df30 100644 --- a/src/tools/other/modis_regrid/Makefile.am +++ b/src/tools/other/modis_regrid/Makefile.am @@ -35,7 +35,7 @@ modis_regrid_LDADD = -lvx_pxm \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_data2d \ diff --git a/src/tools/other/modis_regrid/Makefile.in b/src/tools/other/modis_regrid/Makefile.in index a7382a2588..95adbafe15 100644 --- a/src/tools/other/modis_regrid/Makefile.in +++ b/src/tools/other/modis_regrid/Makefile.in @@ -110,7 +110,7 @@ am_modis_regrid_OBJECTS = modis_regrid-modis_regrid.$(OBJEXT) \ modis_regrid_OBJECTS = $(am_modis_regrid_OBJECTS) am__DEPENDENCIES_1 = modis_regrid_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) modis_regrid_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(modis_regrid_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -278,6 +278,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -360,7 +361,7 @@ modis_regrid_LDADD = -lvx_pxm \ -lvx_data2d_nccf \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_data2d \ diff --git a/src/tools/other/pb2nc/Makefile.am b/src/tools/other/pb2nc/Makefile.am index 9888a2e63b..aa48399345 100644 --- a/src/tools/other/pb2nc/Makefile.am +++ b/src/tools/other/pb2nc/Makefile.am @@ -41,7 +41,7 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/pb2nc/Makefile.in b/src/tools/other/pb2nc/Makefile.in index 39b7e034af..eeb0f7a65f 100644 --- a/src/tools/other/pb2nc/Makefile.in +++ b/src/tools/other/pb2nc/Makefile.in @@ -109,8 +109,8 @@ pb2nc_OBJECTS = $(am_pb2nc_OBJECTS) am__DEPENDENCIES_1 = @BUFRLIB_NAME_SET_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) pb2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) pb2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(pb2nc_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -298,6 +298,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -381,7 +382,7 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ diff --git a/src/tools/other/plot_data_plane/Makefile.am b/src/tools/other/plot_data_plane/Makefile.am index 8c84625e32..14316dc1a5 100644 --- a/src/tools/other/plot_data_plane/Makefile.am +++ b/src/tools/other/plot_data_plane/Makefile.am @@ -20,7 +20,7 @@ plot_data_plane_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/plot_data_plane/Makefile.in b/src/tools/other/plot_data_plane/Makefile.in index 0b2e1cf75a..d0833ea6b8 100644 --- a/src/tools/other/plot_data_plane/Makefile.in +++ b/src/tools/other/plot_data_plane/Makefile.in @@ -106,7 +106,7 @@ am_plot_data_plane_OBJECTS = \ plot_data_plane_OBJECTS = $(am_plot_data_plane_OBJECTS) am__DEPENDENCIES_1 = plot_data_plane_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) plot_data_plane_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(plot_data_plane_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -269,6 +269,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -335,7 +336,7 @@ plot_data_plane_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/plot_point_obs/Makefile.am b/src/tools/other/plot_point_obs/Makefile.am index 9a537321e2..e533198b86 100644 --- a/src/tools/other/plot_point_obs/Makefile.am +++ b/src/tools/other/plot_point_obs/Makefile.am @@ -21,7 +21,7 @@ plot_point_obs_LDADD = -lvx_statistics \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/plot_point_obs/Makefile.in b/src/tools/other/plot_point_obs/Makefile.in index 53788d19c1..f3d8b15d5c 100644 --- a/src/tools/other/plot_point_obs/Makefile.in +++ b/src/tools/other/plot_point_obs/Makefile.in @@ -106,7 +106,8 @@ am_plot_point_obs_OBJECTS = plot_point_obs-plot_point_obs.$(OBJEXT) \ plot_point_obs_OBJECTS = $(am_plot_point_obs_OBJECTS) am__DEPENDENCIES_1 = plot_point_obs_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) plot_point_obs_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(plot_point_obs_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +271,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -338,7 +340,7 @@ plot_point_obs_LDADD = -lvx_statistics \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/point2grid/Makefile.am b/src/tools/other/point2grid/Makefile.am index 805c8b2fd2..e9ed70c742 100644 --- a/src/tools/other/point2grid/Makefile.am +++ b/src/tools/other/point2grid/Makefile.am @@ -21,7 +21,7 @@ point2grid_LDADD = -lvx_statistics \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/point2grid/Makefile.in b/src/tools/other/point2grid/Makefile.in index 5c2cc881d9..d1cfd2740d 100644 --- a/src/tools/other/point2grid/Makefile.in +++ b/src/tools/other/point2grid/Makefile.in @@ -106,7 +106,7 @@ am_point2grid_OBJECTS = point2grid-point2grid.$(OBJEXT) \ point2grid_OBJECTS = $(am_point2grid_OBJECTS) am__DEPENDENCIES_1 = point2grid_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) point2grid_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(point2grid_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -282,6 +282,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -350,7 +351,7 @@ point2grid_LDADD = -lvx_statistics \ -lvx_data2d_grib $(GRIB2_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ $(PYTHON_LIBS) \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/regrid_data_plane/Makefile.am b/src/tools/other/regrid_data_plane/Makefile.am index 2efd122c4f..8c7a4692dd 100644 --- a/src/tools/other/regrid_data_plane/Makefile.am +++ b/src/tools/other/regrid_data_plane/Makefile.am @@ -21,7 +21,7 @@ regrid_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/regrid_data_plane/Makefile.in b/src/tools/other/regrid_data_plane/Makefile.in index d565c60b98..c34f203b8c 100644 --- a/src/tools/other/regrid_data_plane/Makefile.in +++ b/src/tools/other/regrid_data_plane/Makefile.in @@ -106,7 +106,7 @@ am_regrid_data_plane_OBJECTS = \ regrid_data_plane_OBJECTS = $(am_regrid_data_plane_OBJECTS) am__DEPENDENCIES_1 = regrid_data_plane_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) regrid_data_plane_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(regrid_data_plane_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +270,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -337,7 +338,7 @@ regrid_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/shift_data_plane/Makefile.am b/src/tools/other/shift_data_plane/Makefile.am index fa78dbd5f9..498c5365bc 100644 --- a/src/tools/other/shift_data_plane/Makefile.am +++ b/src/tools/other/shift_data_plane/Makefile.am @@ -21,7 +21,7 @@ shift_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/shift_data_plane/Makefile.in b/src/tools/other/shift_data_plane/Makefile.in index 1887ceb5b7..eab017a124 100644 --- a/src/tools/other/shift_data_plane/Makefile.in +++ b/src/tools/other/shift_data_plane/Makefile.in @@ -106,7 +106,7 @@ am_shift_data_plane_OBJECTS = \ shift_data_plane_OBJECTS = $(am_shift_data_plane_OBJECTS) am__DEPENDENCIES_1 = shift_data_plane_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) shift_data_plane_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(shift_data_plane_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +270,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -337,7 +338,7 @@ shift_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/wwmca_tool/Makefile.am b/src/tools/other/wwmca_tool/Makefile.am index bc3fcbce06..53f2b0a508 100644 --- a/src/tools/other/wwmca_tool/Makefile.am +++ b/src/tools/other/wwmca_tool/Makefile.am @@ -44,7 +44,7 @@ wwmca_regrid_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -91,7 +91,7 @@ wwmca_plot_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/src/tools/other/wwmca_tool/Makefile.in b/src/tools/other/wwmca_tool/Makefile.in index 3496883d48..f8aa3f9f44 100644 --- a/src/tools/other/wwmca_tool/Makefile.in +++ b/src/tools/other/wwmca_tool/Makefile.in @@ -113,7 +113,8 @@ am_wwmca_plot_OBJECTS = wwmca_plot-gridhemisphere_to_string.$(OBJEXT) \ wwmca_plot-wwmca_ref.$(OBJEXT) wwmca_plot_OBJECTS = $(am_wwmca_plot_OBJECTS) am__DEPENDENCIES_1 = -wwmca_plot_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +wwmca_plot_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) wwmca_plot_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(wwmca_plot_LDFLAGS) $(LDFLAGS) -o $@ am_wwmca_regrid_OBJECTS = \ @@ -131,7 +132,7 @@ am_wwmca_regrid_OBJECTS = \ wwmca_regrid-nc_output.$(OBJEXT) wwmca_regrid_OBJECTS = $(am_wwmca_regrid_OBJECTS) wwmca_regrid_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) wwmca_regrid_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(wwmca_regrid_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -328,6 +329,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -417,7 +419,7 @@ wwmca_regrid_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -465,7 +467,7 @@ wwmca_plot_LDADD = -lvx_pxm \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/src/tools/tc_utils/Makefile.in b/src/tools/tc_utils/Makefile.in index 6bc15376af..6ca0db4522 100644 --- a/src/tools/tc_utils/Makefile.in +++ b/src/tools/tc_utils/Makefile.in @@ -279,6 +279,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.am b/src/tools/tc_utils/rmw_analysis/Makefile.am index 63e6c7a28e..fba765027a 100644 --- a/src/tools/tc_utils/rmw_analysis/Makefile.am +++ b/src/tools/tc_utils/rmw_analysis/Makefile.am @@ -26,7 +26,7 @@ rmw_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.in b/src/tools/tc_utils/rmw_analysis/Makefile.in index e0f6abe947..d8d42ef7c0 100644 --- a/src/tools/tc_utils/rmw_analysis/Makefile.in +++ b/src/tools/tc_utils/rmw_analysis/Makefile.in @@ -106,7 +106,8 @@ am_rmw_analysis_OBJECTS = rmw_analysis-rmw_analysis.$(OBJEXT) \ rmw_analysis_OBJECTS = $(am_rmw_analysis_OBJECTS) am__DEPENDENCIES_1 = rmw_analysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) rmw_analysis_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(rmw_analysis_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +271,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -343,7 +345,7 @@ rmw_analysis_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_diag/Makefile.am b/src/tools/tc_utils/tc_diag/Makefile.am index 20b10b2711..51132dd579 100644 --- a/src/tools/tc_utils/tc_diag/Makefile.am +++ b/src/tools/tc_utils/tc_diag/Makefile.am @@ -27,7 +27,7 @@ tc_diag_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_diag/Makefile.in b/src/tools/tc_utils/tc_diag/Makefile.in index ab237104e5..2b58eb112d 100644 --- a/src/tools/tc_utils/tc_diag/Makefile.in +++ b/src/tools/tc_utils/tc_diag/Makefile.in @@ -107,7 +107,7 @@ am_tc_diag_OBJECTS = tc_diag-tc_diag.$(OBJEXT) \ tc_diag_OBJECTS = $(am_tc_diag_OBJECTS) am__DEPENDENCIES_1 = tc_diag_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) tc_diag_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(tc_diag_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -272,6 +272,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -346,7 +347,7 @@ tc_diag_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_dland/Makefile.am b/src/tools/tc_utils/tc_dland/Makefile.am index 47af10b1c0..675c0c1952 100644 --- a/src/tools/tc_utils/tc_dland/Makefile.am +++ b/src/tools/tc_utils/tc_dland/Makefile.am @@ -16,7 +16,7 @@ tc_dland_SOURCES = tc_dland.cc \ tc_dland_CPPFLAGS = ${MET_CPPFLAGS} tc_dland_LDFLAGS = ${MET_LDFLAGS} tc_dland_LDADD = -lvx_tc_util \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_nc_util \ -lvx_grid \ -lvx_geodesy \ diff --git a/src/tools/tc_utils/tc_dland/Makefile.in b/src/tools/tc_utils/tc_dland/Makefile.in index 1fff6ed87c..945f5be25f 100644 --- a/src/tools/tc_utils/tc_dland/Makefile.in +++ b/src/tools/tc_utils/tc_dland/Makefile.in @@ -105,7 +105,7 @@ am_tc_dland_OBJECTS = tc_dland-tc_dland.$(OBJEXT) \ tc_dland-tc_poly.$(OBJEXT) tc_dland_OBJECTS = $(am_tc_dland_OBJECTS) am__DEPENDENCIES_1 = -tc_dland_DEPENDENCIES = $(am__DEPENDENCIES_1) +tc_dland_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) tc_dland_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(tc_dland_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -281,6 +281,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -344,7 +345,7 @@ tc_dland_SOURCES = tc_dland.cc \ tc_dland_CPPFLAGS = ${MET_CPPFLAGS} tc_dland_LDFLAGS = ${MET_LDFLAGS} tc_dland_LDADD = -lvx_tc_util \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_nc_util \ -lvx_grid \ -lvx_geodesy \ diff --git a/src/tools/tc_utils/tc_gen/Makefile.am b/src/tools/tc_utils/tc_gen/Makefile.am index 5ca6353aee..92e0f521d2 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.am +++ b/src/tools/tc_utils/tc_gen/Makefile.am @@ -27,7 +27,7 @@ tc_gen_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_gis \ -lvx_data2d \ diff --git a/src/tools/tc_utils/tc_gen/Makefile.in b/src/tools/tc_utils/tc_gen/Makefile.in index 69e77e4aeb..53bc5e92e9 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.in +++ b/src/tools/tc_utils/tc_gen/Makefile.in @@ -106,7 +106,7 @@ am_tc_gen_OBJECTS = tc_gen-tc_gen.$(OBJEXT) \ tc_gen_OBJECTS = $(am_tc_gen_OBJECTS) am__DEPENDENCIES_1 = tc_gen_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) tc_gen_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(tc_gen_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -270,6 +270,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -344,7 +345,7 @@ tc_gen_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_gis \ -lvx_data2d \ diff --git a/src/tools/tc_utils/tc_pairs/Makefile.am b/src/tools/tc_utils/tc_pairs/Makefile.am index 6626964a6c..37ff3b7616 100644 --- a/src/tools/tc_utils/tc_pairs/Makefile.am +++ b/src/tools/tc_utils/tc_pairs/Makefile.am @@ -29,7 +29,7 @@ tc_pairs_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_pairs/Makefile.in b/src/tools/tc_utils/tc_pairs/Makefile.in index faf8501eb9..8f11ac0233 100644 --- a/src/tools/tc_utils/tc_pairs/Makefile.in +++ b/src/tools/tc_utils/tc_pairs/Makefile.in @@ -106,7 +106,7 @@ am_tc_pairs_OBJECTS = tc_pairs-tc_pairs.$(OBJEXT) acerr.$(OBJEXT) \ tc_pairs_OBJECTS = $(am_tc_pairs_OBJECTS) am__DEPENDENCIES_1 = tc_pairs_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) tc_pairs_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(tc_pairs_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -294,6 +294,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -370,7 +371,7 @@ tc_pairs_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_rmw/Makefile.am b/src/tools/tc_utils/tc_rmw/Makefile.am index 12676b3430..b9b562f747 100644 --- a/src/tools/tc_utils/tc_rmw/Makefile.am +++ b/src/tools/tc_utils/tc_rmw/Makefile.am @@ -27,7 +27,7 @@ tc_rmw_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_rmw/Makefile.in b/src/tools/tc_utils/tc_rmw/Makefile.in index 43bf8353df..4602c2cde2 100644 --- a/src/tools/tc_utils/tc_rmw/Makefile.in +++ b/src/tools/tc_utils/tc_rmw/Makefile.in @@ -107,7 +107,7 @@ am_tc_rmw_OBJECTS = tc_rmw-tc_rmw.$(OBJEXT) \ tc_rmw_OBJECTS = $(am_tc_rmw_OBJECTS) am__DEPENDENCIES_1 = tc_rmw_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) tc_rmw_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(tc_rmw_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -272,6 +272,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -346,7 +347,7 @@ tc_rmw_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_stat/Makefile.am b/src/tools/tc_utils/tc_stat/Makefile.am index e668d0feb7..8823604e0f 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.am +++ b/src/tools/tc_utils/tc_stat/Makefile.am @@ -29,7 +29,7 @@ tc_stat_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/tc_utils/tc_stat/Makefile.in b/src/tools/tc_utils/tc_stat/Makefile.in index ae8ecd44b2..e9f4fedbee 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.in +++ b/src/tools/tc_utils/tc_stat/Makefile.in @@ -106,7 +106,8 @@ am_tc_stat_OBJECTS = tc_stat-tc_stat.$(OBJEXT) \ tc_stat-tc_stat_files.$(OBJEXT) tc_stat-tc_stat_job.$(OBJEXT) tc_stat_OBJECTS = $(am_tc_stat_OBJECTS) am__DEPENDENCIES_1 = -tc_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +tc_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) tc_stat_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(tc_stat_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -272,6 +273,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -348,7 +350,7 @@ tc_stat_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ From 478a5b8252eec2216d32208c8e3f1b00421f854c Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 10 Oct 2023 17:34:07 -0600 Subject: [PATCH 044/109] #2574 Replaced libraries with UGRID_LIBS --- .../test_util/libcode/vx_data2d/Makefile.am | 2 +- .../test_util/libcode/vx_data2d/Makefile.in | 6 +- .../libcode/vx_data2d_factory/Makefile.am | 2 +- .../libcode/vx_data2d_factory/Makefile.in | 5 +- .../libcode/vx_data2d_grib/Makefile.am | 2 +- .../libcode/vx_data2d_grib/Makefile.in | 6 +- .../libcode/vx_data2d_nc_met/Makefile.am | 2 +- .../libcode/vx_data2d_nc_met/Makefile.in | 6 +- .../libcode/vx_data2d_nccf/Makefile.am | 2 +- .../libcode/vx_data2d_nccf/Makefile.in | 6 +- .../test_util/libcode/vx_grid/Makefile.am | 2 +- .../test_util/libcode/vx_grid/Makefile.in | 6 +- .../tools/other/mode_time_domain/Makefile.am | 2 +- .../tools/other/mode_time_domain/Makefile.in | 6 +- src/libcode/vx_grid/Makefile.am | 7 ++- src/libcode/vx_grid/Makefile.in | 58 +++++++++---------- 16 files changed, 69 insertions(+), 51 deletions(-) diff --git a/internal/test_util/libcode/vx_data2d/Makefile.am b/internal/test_util/libcode/vx_data2d/Makefile.am index 27b3d1409c..453764611d 100644 --- a/internal/test_util/libcode/vx_data2d/Makefile.am +++ b/internal/test_util/libcode/vx_data2d/Makefile.am @@ -34,7 +34,7 @@ dump_default_table_LDFLAGS = -L. ${MET_LDFLAGS} dump_default_table_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_log \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_grid \ -lvx_geodesy \ diff --git a/internal/test_util/libcode/vx_data2d/Makefile.in b/internal/test_util/libcode/vx_data2d/Makefile.in index d366465daa..1a9d7a5ac3 100644 --- a/internal/test_util/libcode/vx_data2d/Makefile.in +++ b/internal/test_util/libcode/vx_data2d/Makefile.in @@ -103,7 +103,8 @@ PROGRAMS = $(noinst_PROGRAMS) am_dump_default_table_OBJECTS = \ dump_default_table-dump_default_table.$(OBJEXT) dump_default_table_OBJECTS = $(am_dump_default_table_OBJECTS) -dump_default_table_DEPENDENCIES = +am__DEPENDENCIES_1 = +dump_default_table_DEPENDENCIES = $(am__DEPENDENCIES_1) dump_default_table_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(dump_default_table_LDFLAGS) $(LDFLAGS) -o $@ am_test_table_read_OBJECTS = \ @@ -275,6 +276,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -353,7 +355,7 @@ dump_default_table_LDFLAGS = -L. ${MET_LDFLAGS} dump_default_table_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_log \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_grid \ -lvx_geodesy \ diff --git a/internal/test_util/libcode/vx_data2d_factory/Makefile.am b/internal/test_util/libcode/vx_data2d_factory/Makefile.am index 9b8a751186..4f316f1fb1 100644 --- a/internal/test_util/libcode/vx_data2d_factory/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_factory/Makefile.am @@ -36,7 +36,7 @@ test_factory_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/internal/test_util/libcode/vx_data2d_factory/Makefile.in b/internal/test_util/libcode/vx_data2d_factory/Makefile.in index 430ce5e9f3..b9a5504200 100644 --- a/internal/test_util/libcode/vx_data2d_factory/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_factory/Makefile.in @@ -104,7 +104,7 @@ am_test_factory_OBJECTS = test_factory-test_factory.$(OBJEXT) test_factory_OBJECTS = $(am_test_factory_OBJECTS) am__DEPENDENCIES_1 = test_factory_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) test_factory_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(test_factory_LDFLAGS) $(LDFLAGS) -o $@ am_test_is_grib_OBJECTS = test_is_grib-test_is_grib.$(OBJEXT) @@ -273,6 +273,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -353,7 +354,7 @@ test_factory_LDADD = -lvx_stat_out \ -lvx_data2d_nc_pinterp \ $(PYTHON_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/internal/test_util/libcode/vx_data2d_grib/Makefile.am b/internal/test_util/libcode/vx_data2d_grib/Makefile.am index 6b095600ee..09f082b3a0 100644 --- a/internal/test_util/libcode/vx_data2d_grib/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_grib/Makefile.am @@ -16,7 +16,7 @@ test_read_grib1_SOURCES = test_read_grib1.cc test_read_grib1_CPPFLAGS = ${MET_CPPFLAGS} test_read_grib1_LDFLAGS = -L. ${MET_LDFLAGS} test_read_grib1_LDADD = -lvx_data2d_grib \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_grid \ -lvx_geodesy \ diff --git a/internal/test_util/libcode/vx_data2d_grib/Makefile.in b/internal/test_util/libcode/vx_data2d_grib/Makefile.in index 508ca72877..8d0575e2ac 100644 --- a/internal/test_util/libcode/vx_data2d_grib/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_grib/Makefile.in @@ -103,7 +103,8 @@ PROGRAMS = $(noinst_PROGRAMS) am_test_read_grib1_OBJECTS = \ test_read_grib1-test_read_grib1.$(OBJEXT) test_read_grib1_OBJECTS = $(am_test_read_grib1_OBJECTS) -test_read_grib1_DEPENDENCIES = +am__DEPENDENCIES_1 = +test_read_grib1_DEPENDENCIES = $(am__DEPENDENCIES_1) test_read_grib1_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(test_read_grib1_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -266,6 +267,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -327,7 +329,7 @@ test_read_grib1_SOURCES = test_read_grib1.cc test_read_grib1_CPPFLAGS = ${MET_CPPFLAGS} test_read_grib1_LDFLAGS = -L. ${MET_LDFLAGS} test_read_grib1_LDADD = -lvx_data2d_grib \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_grid \ -lvx_geodesy \ diff --git a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am index 5b7ce18f8c..e9094e8dbe 100644 --- a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am @@ -16,7 +16,7 @@ test_read_nc_met_SOURCES = test_read_nc_met.cc test_read_nc_met_CPPFLAGS = ${MET_CPPFLAGS} test_read_nc_met_LDFLAGS = -L. ${MET_LDFLAGS} test_read_nc_met_LDADD = -lvx_data2d_nc_met \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_nc_util \ -lvx_data2d \ -lvx_grid \ diff --git a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in index ea68ce11ea..1c3276e1db 100644 --- a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in @@ -103,7 +103,8 @@ PROGRAMS = $(noinst_PROGRAMS) am_test_read_nc_met_OBJECTS = \ test_read_nc_met-test_read_nc_met.$(OBJEXT) test_read_nc_met_OBJECTS = $(am_test_read_nc_met_OBJECTS) -test_read_nc_met_DEPENDENCIES = +am__DEPENDENCIES_1 = +test_read_nc_met_DEPENDENCIES = $(am__DEPENDENCIES_1) test_read_nc_met_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(test_read_nc_met_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -267,6 +268,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -328,7 +330,7 @@ test_read_nc_met_SOURCES = test_read_nc_met.cc test_read_nc_met_CPPFLAGS = ${MET_CPPFLAGS} test_read_nc_met_LDFLAGS = -L. ${MET_LDFLAGS} test_read_nc_met_LDADD = -lvx_data2d_nc_met \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_nc_util \ -lvx_data2d \ -lvx_grid \ diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.am b/internal/test_util/libcode/vx_data2d_nccf/Makefile.am index 554a72d826..84261adf7e 100644 --- a/internal/test_util/libcode/vx_data2d_nccf/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_nccf/Makefile.am @@ -16,7 +16,7 @@ test_read_nccf_SOURCES = test_read_nccf.cc test_read_nccf_CPPFLAGS = ${MET_CPPFLAGS} test_read_nccf_LDFLAGS = -L. ${MET_LDFLAGS} test_read_nccf_LDADD = -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_nc_util \ -lvx_data2d \ -lvx_grid \ diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in index 196d0855d6..98e7a40e4f 100644 --- a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in @@ -102,7 +102,8 @@ CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) am_test_read_nccf_OBJECTS = test_read_nccf-test_read_nccf.$(OBJEXT) test_read_nccf_OBJECTS = $(am_test_read_nccf_OBJECTS) -test_read_nccf_DEPENDENCIES = +am__DEPENDENCIES_1 = +test_read_nccf_DEPENDENCIES = $(am__DEPENDENCIES_1) test_read_nccf_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(test_read_nccf_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -265,6 +266,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -326,7 +328,7 @@ test_read_nccf_SOURCES = test_read_nccf.cc test_read_nccf_CPPFLAGS = ${MET_CPPFLAGS} test_read_nccf_LDFLAGS = -L. ${MET_LDFLAGS} test_read_nccf_LDADD = -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_nc_util \ -lvx_data2d \ -lvx_grid \ diff --git a/internal/test_util/libcode/vx_grid/Makefile.am b/internal/test_util/libcode/vx_grid/Makefile.am index 259ab24d0d..c783c32b22 100644 --- a/internal/test_util/libcode/vx_grid/Makefile.am +++ b/internal/test_util/libcode/vx_grid/Makefile.am @@ -16,7 +16,7 @@ test_grid_area_SOURCES = test_grid_area.cc test_grid_area_CPPFLAGS = ${MET_CPPFLAGS} test_grid_area_LDFLAGS = -L. ${MET_LDFLAGS} test_grid_area_LDADD = \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_grid \ -lvx_geodesy \ -lvx_nav \ diff --git a/internal/test_util/libcode/vx_grid/Makefile.in b/internal/test_util/libcode/vx_grid/Makefile.in index 1337d0b370..209554b83e 100644 --- a/internal/test_util/libcode/vx_grid/Makefile.in +++ b/internal/test_util/libcode/vx_grid/Makefile.in @@ -102,7 +102,8 @@ CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) am_test_grid_area_OBJECTS = test_grid_area-test_grid_area.$(OBJEXT) test_grid_area_OBJECTS = $(am_test_grid_area_OBJECTS) -test_grid_area_DEPENDENCIES = +am__DEPENDENCIES_1 = +test_grid_area_DEPENDENCIES = $(am__DEPENDENCIES_1) test_grid_area_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(test_grid_area_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -265,6 +266,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -326,7 +328,7 @@ test_grid_area_SOURCES = test_grid_area.cc test_grid_area_CPPFLAGS = ${MET_CPPFLAGS} test_grid_area_LDFLAGS = -L. ${MET_LDFLAGS} test_grid_area_LDADD = \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_grid \ -lvx_geodesy \ -lvx_nav \ diff --git a/internal/test_util/tools/other/mode_time_domain/Makefile.am b/internal/test_util/tools/other/mode_time_domain/Makefile.am index d2a4ad1fe5..29438855ca 100644 --- a/internal/test_util/tools/other/mode_time_domain/Makefile.am +++ b/internal/test_util/tools/other/mode_time_domain/Makefile.am @@ -58,7 +58,7 @@ test_velocity_LDADD = \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/internal/test_util/tools/other/mode_time_domain/Makefile.in b/internal/test_util/tools/other/mode_time_domain/Makefile.in index bcd7d2584f..afc54c9477 100644 --- a/internal/test_util/tools/other/mode_time_domain/Makefile.in +++ b/internal/test_util/tools/other/mode_time_domain/Makefile.in @@ -127,7 +127,8 @@ test_velocity_DEPENDENCIES = ${top_builddir}/src/tools/other/mode_time_domain/mt ${top_builddir}/src/tools/other/mode_time_domain/mtd-mtd_txt_output.o \ ${top_builddir}/src/tools/other/mode_time_domain/mtd-nc_grid.o \ ${top_builddir}/src/tools/other/mode_time_domain/mtd-nc_utils_local.o \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) test_velocity_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(test_velocity_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -290,6 +291,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -393,7 +395,7 @@ test_velocity_LDADD = \ $(PYTHON_LIBS) \ -lvx_statistics \ -lvx_data2d_nccf \ - -lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry \ + $(UGRID_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/src/libcode/vx_grid/Makefile.am b/src/libcode/vx_grid/Makefile.am index e9cd604362..58e572439b 100644 --- a/src/libcode/vx_grid/Makefile.am +++ b/src/libcode/vx_grid/Makefile.am @@ -34,6 +34,11 @@ libvx_grid_a_SOURCES = \ goes_grid.cc goes_grid.h \ semilatlon_grid_defs.h \ semilatlon_grid.cc semilatlon_grid.h \ - unstructured_grid.cc unstructured_grid.h unstructured_grid_defs.h \ vx_grid.h + +if ENABLE_UGRID + libvx_grid_a_SOURCES += unstructured_grid.cc unstructured_grid.h unstructured_grid_defs.h +endif + + libvx_grid_a_CPPFLAGS = ${MET_CPPFLAGS} diff --git a/src/libcode/vx_grid/Makefile.in b/src/libcode/vx_grid/Makefile.in index 3a89452b27..1c1240cc64 100644 --- a/src/libcode/vx_grid/Makefile.in +++ b/src/libcode/vx_grid/Makefile.in @@ -88,6 +88,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@ENABLE_UGRID_TRUE@am__append_1 = unstructured_grid.cc unstructured_grid.h unstructured_grid_defs.h subdir = src/libcode/vx_grid ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -107,6 +108,20 @@ am__v_AR_0 = @echo " AR " $@; am__v_AR_1 = libvx_grid_a_AR = $(AR) $(ARFLAGS) libvx_grid_a_LIBADD = +am__libvx_grid_a_SOURCES_DIST = earth_rotation.cc earth_rotation.h \ + find_grid_by_name.cc find_grid_by_name.h grid_base.cc \ + grid_base.h latlon_grid_defs.h latlon_grid.cc latlon_grid.h \ + laea_grid_defs.h laea_grid.cc laea_grid.h lc_grid_defs.h \ + lc_grid.cc lc_grid.h merc_grid_defs.h merc_grid.cc merc_grid.h \ + gaussian_grid_defs.h gaussian_grid.cc gaussian_grid.h \ + st_grid_defs.h st_grid.cc st_grid.h latlon_xyz.h latlon_xyz.cc \ + rot_latlon_grid.cc rot_latlon_grid.h tcrmw_grid.cc \ + tcrmw_grid.h goes_grid_defs.h goes_grid.cc goes_grid.h \ + semilatlon_grid_defs.h semilatlon_grid.cc semilatlon_grid.h \ + vx_grid.h unstructured_grid.cc unstructured_grid.h \ + unstructured_grid_defs.h +@ENABLE_UGRID_TRUE@am__objects_1 = \ +@ENABLE_UGRID_TRUE@ libvx_grid_a-unstructured_grid.$(OBJEXT) am_libvx_grid_a_OBJECTS = libvx_grid_a-earth_rotation.$(OBJEXT) \ libvx_grid_a-find_grid_by_name.$(OBJEXT) \ libvx_grid_a-grid_base.$(OBJEXT) \ @@ -120,8 +135,7 @@ am_libvx_grid_a_OBJECTS = libvx_grid_a-earth_rotation.$(OBJEXT) \ libvx_grid_a-rot_latlon_grid.$(OBJEXT) \ libvx_grid_a-tcrmw_grid.$(OBJEXT) \ libvx_grid_a-goes_grid.$(OBJEXT) \ - libvx_grid_a-semilatlon_grid.$(OBJEXT) \ - libvx_grid_a-unstructured_grid.$(OBJEXT) + libvx_grid_a-semilatlon_grid.$(OBJEXT) $(am__objects_1) libvx_grid_a_OBJECTS = $(am_libvx_grid_a_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -184,7 +198,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = SOURCES = $(libvx_grid_a_SOURCES) -DIST_SOURCES = $(libvx_grid_a_SOURCES) +DIST_SOURCES = $(am__libvx_grid_a_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -309,6 +323,7 @@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +UGRID_LIBS = @UGRID_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -369,32 +384,17 @@ MAINTAINERCLEANFILES = Makefile.in # The library noinst_LIBRARIES = libvx_grid.a -libvx_grid_a_SOURCES = \ - earth_rotation.cc earth_rotation.h \ - find_grid_by_name.cc find_grid_by_name.h \ - grid_base.cc grid_base.h \ - latlon_grid_defs.h \ - latlon_grid.cc latlon_grid.h \ - laea_grid_defs.h \ - laea_grid.cc laea_grid.h \ - lc_grid_defs.h \ - lc_grid.cc lc_grid.h \ - merc_grid_defs.h \ - merc_grid.cc merc_grid.h \ - gaussian_grid_defs.h \ - gaussian_grid.cc gaussian_grid.h \ - st_grid_defs.h \ - st_grid.cc st_grid.h \ - latlon_xyz.h latlon_xyz.cc \ - rot_latlon_grid.cc rot_latlon_grid.h \ - tcrmw_grid.cc tcrmw_grid.h \ - goes_grid_defs.h \ - goes_grid.cc goes_grid.h \ - semilatlon_grid_defs.h \ - semilatlon_grid.cc semilatlon_grid.h \ - unstructured_grid.cc unstructured_grid.h unstructured_grid_defs.h \ - vx_grid.h - +libvx_grid_a_SOURCES = earth_rotation.cc earth_rotation.h \ + find_grid_by_name.cc find_grid_by_name.h grid_base.cc \ + grid_base.h latlon_grid_defs.h latlon_grid.cc latlon_grid.h \ + laea_grid_defs.h laea_grid.cc laea_grid.h lc_grid_defs.h \ + lc_grid.cc lc_grid.h merc_grid_defs.h merc_grid.cc merc_grid.h \ + gaussian_grid_defs.h gaussian_grid.cc gaussian_grid.h \ + st_grid_defs.h st_grid.cc st_grid.h latlon_xyz.h latlon_xyz.cc \ + rot_latlon_grid.cc rot_latlon_grid.h tcrmw_grid.cc \ + tcrmw_grid.h goes_grid_defs.h goes_grid.cc goes_grid.h \ + semilatlon_grid_defs.h semilatlon_grid.cc semilatlon_grid.h \ + vx_grid.h $(am__append_1) libvx_grid_a_CPPFLAGS = ${MET_CPPFLAGS} all: all-am From 8a8ffe8d0f068d1d824bf79b6763fa51ab0a2acb Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Mon, 30 Oct 2023 16:14:07 -0600 Subject: [PATCH 045/109] #2231 Added find_nc_vinfo_list --- src/libcode/vx_data2d_ugrid/ugrid_file.cc | 13 +++++++++++++ src/libcode/vx_data2d_ugrid/ugrid_file.h | 2 ++ 2 files changed, 15 insertions(+) diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.cc b/src/libcode/vx_data2d_ugrid/ugrid_file.cc index 60658264ab..f1c50fdad4 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.cc +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.cc @@ -598,6 +598,19 @@ NcVarInfo* UGridFile::find_var_by_dim_name(const char *dim_name) const } +//////////////////////////////////////////////////////////////////////// + +bool UGridFile::find_nc_vinfo_list(const char *var_name, + std::vector &vinfo_list) const +{ + vinfo_list.clear(); + for (int i = 0; i < Nvars; i++) { + if (Var[i].name.startswith(var_name)) vinfo_list.push_back(&Var[i]); + } + return vinfo_list.size() > 0; +} + + //////////////////////////////////////////////////////////////////////// diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.h b/src/libcode/vx_data2d_ugrid/ugrid_file.h index 75897fe693..17a15bee1c 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.h +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.h @@ -107,6 +107,8 @@ class UGridFile { netCDF::NcDim *get_vert_dim() const; NcVarInfo* find_by_name(const char * var_name) const; NcVarInfo* find_var_by_dim_name(const char *dim_name) const; + bool find_nc_vinfo_list(const char *var_name, std::vector &vinfo_list) const; + private: From 09ac51a373ce06537c7fd98e0102af4c07f98c19 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Mon, 30 Oct 2023 16:15:26 -0600 Subject: [PATCH 046/109] #2231 Support L and P notations for the level string --- src/libcode/vx_data2d_ugrid/var_info_ugrid.cc | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc b/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc index e039ac0d01..47cd9bf159 100644 --- a/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc +++ b/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc @@ -218,8 +218,8 @@ void VarInfoUGrid::set_magic(const ConcatString &nstr, const ConcatString &lstr) Level.set_lower(as_offset ? atoi(ptr2) : atof(ptr2)); Level.set_upper(as_offset ? atoi(ptr3) : atof(ptr3)); - // Assume pressure level type for a range of levels - Level.set_type(LevelType_Pres); + // Assume None type (offset instead of pressure level) for a range of levels + Level.set_type(LevelType_None); // like Ldd-dd Level.set_is_offset(as_offset); } } @@ -336,11 +336,18 @@ void VarInfoUGrid::set_magic(const ConcatString &nstr, const ConcatString &lstr) void VarInfoUGrid::set_dict(Dictionary &dict){ + char lvl_type = ' '; + ConcatString cfg_name = dict.lookup_string("name"); + ConcatString cfg_level = dict.lookup_string("level"); + VarInfo::set_dict(dict); - set_magic(dict.lookup_string("name"), - dict.lookup_string("level")); - set_req_name(dict.lookup_string("name").c_str()); + if (cfg_level.length() > 0) lvl_type = cfg_level.char_at(0); + if (lvl_type == 'A' || lvl_type == 'Z' || lvl_type == 'P' || + lvl_type == 'R' || lvl_type == 'L') set_level_info_grib(dict); + else set_magic(cfg_name, cfg_level); + + set_req_name(cfg_name.c_str()); return; } From 1e55bbb425a75eb4062d07e8210beabfb0e6a611 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Mon, 30 Oct 2023 16:16:05 -0600 Subject: [PATCH 047/109] #2231 Support L and P notation for the level string --- src/libcode/vx_data2d_ugrid/data2d_ugrid.cc | 560 ++++++++++++-------- src/libcode/vx_data2d_ugrid/data2d_ugrid.h | 11 +- 2 files changed, 355 insertions(+), 216 deletions(-) diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc index e5d2541a02..db9b41dab5 100644 --- a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc @@ -168,170 +168,160 @@ void MetUGridDataFile::dump(ostream & out, int depth) const { bool MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane) { - // Not sure why we do this - - NcVarInfo *data_var = (NcVarInfo *)nullptr; - VarInfoUGrid *vinfo_nc = (VarInfoUGrid *)&vinfo; - static const string method_name + bool status = false; + NcVarInfo *data_var = (NcVarInfo *)nullptr; + VarInfoUGrid *vinfo_nc = (VarInfoUGrid *)&vinfo; + const long time_cnt = (long)_file->ValidTime.n(); + static const string method_name = "MetUGridDataFile::data_plane(VarInfo &, DataPlane &) -> "; - // Initialize the data plane - - plane.clear(); - - // Check for NA in the requested name - //if ( vinfo_nc->req_name() == na_str ) - //{ - // // Store the name of the first data variable - // data_var = find_first_data_var(); - // if (nullptr != data_var) vinfo_nc->set_req_name(data_var->name.c_str()); - //} - - int zdim_slot = bad_data_int; - int time_dim_slot = bad_data_int; - long org_time_offset = bad_data_int; - long org_z_offset = bad_data_int; - NumArray dim_value = vinfo_nc->dim_value(); - LongArray dimension = vinfo_nc->dimension(); - BoolArray is_offset = vinfo_nc->is_offset(); - - data_var = _file->find_by_name(vinfo_nc->req_name().c_str()); - if (nullptr != data_var) { - zdim_slot = data_var->z_slot; - time_dim_slot = data_var->t_slot; - for (int idx=0; idxValidTime.n(); - long time_threshold_cnt = 10000000; - org_time_offset = dim_offset; - long time_offset = org_time_offset; - if (time_offset == range_flag) time_offset = _cur_time_index; // from data_plane_array() - else if (!is_offset[idx]) { - long time_value = dim_value[idx]; - time_offset = convert_time_to_offset(time_value); - if ((0 > time_offset) || (time_offset >= time_cnt)) { - if (time_value > time_threshold_cnt) // from time string (yyyymmdd_hh) - mlog << Warning << "\n" << method_name << "the requested time " - << unix_to_yyyymmdd_hhmmss(time_value) << " for \"" - << vinfo.req_name() << "\" variable does not exist (" - << unix_to_yyyymmdd_hhmmss(_file->ValidTime[0]) << " and " - << unix_to_yyyymmdd_hhmmss(_file->ValidTime[time_cnt-1]) << ").\n\n"; - else - mlog << Warning << "\n" << method_name << "the requested time value " - << time_value << " for \"" << vinfo.req_name() << "\" variable " - << "is out of range (between 0 and " << (time_cnt-1) << ").\n\n"; - - return false; - } - } - else if ((0 > time_offset) || (time_offset >= time_cnt)) { - time_offset = convert_time_to_offset(time_offset); - } - if ((0 > time_offset) || (time_offset >= time_cnt)) { - mlog << Error << "\n" << method_name << "the requested time offset " - << time_offset << " for \"" << vinfo.req_name() << "\" variable " - << "is out of range (between 0 and " << (time_cnt-1) << ").\n\n"; - return false; - } - dimension[time_dim_slot] = time_offset; - } - else if (idx == zdim_slot) { - long z_cnt = (long)get_dim_size(_file->get_vert_dim()); - org_z_offset = dim_offset; - long z_offset = dim_offset; - //if (!is_offset[idx]) { - // // convert the value to index for slicing - // z_offset = convert_value_to_offset(dim_value[idx], z_dim_name); - //} - if (z_offset == range_flag) z_offset = _cur_vert_index; // from data_plane_array() - if ((z_offset >= 0) && (z_offset < z_cnt)) { - dimension[idx] = long(z_offset); - } - //else { - // if (is_offset[idx]) - // mlog << Error << "\n" << method_name << "the requested vertical offset " - // << dim_offset << " for \"" << vinfo.req_name() << "\" variable " - // << "is out of range (between 0 and " << (z_cnt-1) << ").\n\n"; - // else - // mlog << Error << "\n" << method_name << "the requested vertical value " - // << dim_value[idx] << " for \"" << vinfo.req_name() << "\" variable " - // << "does not exist (data size = " << z_cnt << ").\n\n"; - // return false; - //} + // Initialize the data plane + + plane.clear(); + + data_var = _file->find_by_name(vinfo_nc->req_name().c_str()); + if (nullptr != data_var) { + int zdim_slot = data_var->z_slot; + int time_dim_slot = data_var->t_slot; + NumArray dim_value = vinfo_nc->dim_value(); + LongArray dimension(vinfo_nc->dimension()); + BoolArray is_offset(vinfo_nc->is_offset()); + for (int idx=0; idx time_offset) || (time_offset >= time_cnt)) { + time_offset = convert_time_to_offset(time_offset); + } + if ((0 > time_offset) || (time_offset >= time_cnt)) { + mlog << Error << "\n" << method_name << "the requested time offset " + << time_offset << " for \"" << vinfo.req_name() << "\" variable " + << "is out of range (between 0 and " << (time_cnt-1) << ").\n\n"; + return false; + } + dimension[time_dim_slot] = time_offset; + } + else if (idx == zdim_slot) { + const long z_cnt = (long)get_dim_size(_file->get_vert_dim()); + long z_offset = dim_offset; + if (z_offset == range_flag) z_offset = _cur_vert_index; // from data_plane_array() + //else if (!is_offset[idx]) { + // // convert the value to index for slicing + // z_offset = convert_value_to_offset(dim_value[idx], z_dim_name); + //} + if ((z_offset >= 0) && (z_offset < z_cnt)) { + dimension[idx] = long(z_offset); + } + //else { + // if (is_offset[idx]) + // mlog << Error << "\n" << method_name << "the requested vertical offset " + // << dim_offset << " for \"" << vinfo.req_name() << "\" variable " + // << "is out of range (between 0 and " << (z_cnt-1) << ").\n\n"; + // else + // mlog << Error << "\n" << method_name << "the requested vertical value " + // << dim_value[idx] << " for \"" << vinfo.req_name() << "\" variable " + // << "does not exist (data size = " << z_cnt << ").\n\n"; + // return false; + //} + } } - } - } - - // Read the data - NcVarInfo *info = (NcVarInfo *) 0; - - bool status = _file->getData(vinfo_nc->req_name().c_str(), - dimension, - plane, info); - - if (org_time_offset != bad_data_int && 0 <= time_dim_slot) - dimension[time_dim_slot] = org_time_offset; - if (org_z_offset != bad_data_int && 0 <= zdim_slot) - dimension[zdim_slot] = org_z_offset; - - // Check that the times match those requested - - if (status) - { - // Check that the valid time matches the request - - if (vinfo.valid() > 0 && vinfo.valid() != plane.valid()) - { - // Compute time strings - - ConcatString req_time_str = unix_to_yyyymmdd_hhmmss(vinfo.valid()); - ConcatString data_time_str = unix_to_yyyymmdd_hhmmss(plane.valid()); - - mlog << Warning << "\n" << method_name - << "for \"" << vinfo.req_name() << "\" variable, the valid " - << "time does not match the requested valid time: (" - << data_time_str << " != " << req_time_str << ")\n\n"; - status = false; - } - - // Check that the lead time matches the request - - if (vinfo.lead() > 0 && vinfo.lead() != plane.lead()) - { - // Compute time strings - - ConcatString req_time_str = sec_to_hhmmss(vinfo.lead()); - ConcatString data_time_str = sec_to_hhmmss(plane.lead()); - - mlog << Warning << "\n" << method_name - << "for \"" << vinfo.req_name() << "\" variable, the lead " - << "time does not match the requested lead time: (" - << data_time_str << " != " << req_time_str << ")\n\n"; - status = false; - } - - status = process_data_plane(&vinfo, plane); + // Read the data + status = read_data_plane(vinfo.req_name(), vinfo, plane, dimension); + } - // Set the VarInfo object's name, long_name, level, and units strings + return status; +} - if (info->name_att.length() > 0) - vinfo.set_name(info->name_att); - else - vinfo.set_name(info->name); - if (info->long_name_att.length() > 0) - vinfo.set_long_name(info->long_name_att.c_str()); +//////////////////////////////////////////////////////////////////////// +// Find the actual variable from the requested variuable name. +// The requested variable name is the prefix of the actual variable name. +// - if (info->level_att.length() > 0) - vinfo.set_level_name(info->level_att.c_str()); +bool MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane, NcVarInfo *data_var) +{ + // Not sure why we do this + bool status = false; + const long time_cnt = (long)_file->ValidTime.n(); + VarInfoUGrid *vinfo_nc = (VarInfoUGrid *)&vinfo; + static const string method_name + = "MetUGridDataFile::data_plane(VarInfo &, DataPlane &, NcVarInfo *) -> "; + + // Initialize the data plane + + plane.clear(); + + int zdim_slot = bad_data_int; + int time_dim_slot = bad_data_int; +// long org_time_offset = bad_data_int; +// long org_z_offset = bad_data_int; + NumArray dim_value = vinfo_nc->dim_value(); + LongArray dimension(vinfo_nc->dimension()); + BoolArray is_offset(vinfo_nc->is_offset()); + + if (nullptr != data_var) { + zdim_slot = data_var->z_slot; + time_dim_slot = data_var->t_slot; + + // Adjust didmension and is_offset + int dim_size = dimension.n_elements(); + if (0 == dimension.n_elements()) { + for (int idx=0; idxNdims; idx++) { + long offset = 0; + if (zdim_slot == idx &&_cur_vert_index >= 0) offset = _cur_vert_index; + dimension.add(offset); + is_offset.add(true); + } + } + for (int idx=0; idx time_offset) || (time_offset >= time_cnt)) { + time_offset = convert_time_to_offset(time_offset); + } + if ((0 > time_offset) || (time_offset >= time_cnt)) { + mlog << Error << "\n" << method_name << "the requested time offset " + << time_offset << " for \"" << vinfo.req_name() << "\" variable " + << "is out of range (between 0 and " << (time_cnt-1) << ").\n\n"; + return false; + } + dimension[time_dim_slot] = time_offset; + } + else if (idx == zdim_slot) { + long z_cnt = (long)get_dim_size(_file->get_vert_dim()); + long z_offset = dim_offset; + if (z_offset == range_flag) z_offset = _cur_vert_index; // from data_plane_array() + //else if (!is_offset[idx]) { + // // convert the value to index for slicing + // z_offset = convert_value_to_offset(dim_value[idx], z_dim_name); + //} + if ((z_offset >= 0) && (z_offset < z_cnt)) { + dimension[idx] = long(z_offset); + } + } + } - if (info->units_att.length() > 0) - vinfo.set_units(info->units_att.c_str()); - } + // Read the data + status = read_data_plane(data_var->name, vinfo, plane, dimension); + } - return status; + return status; } //////////////////////////////////////////////////////////////////////// @@ -347,17 +337,19 @@ int MetUGridDataFile::data_plane_array(VarInfo &vinfo, // Initialize plane_array.clear(); - long lvl_lower = bad_data_int; - long lvl_upper = bad_data_int; LevelInfo level = vinfo.level(); + long lvl_lower = level.lower(); + long lvl_upper = level.upper(); const int debug_level = 7; + ConcatString req_name = vinfo.req_name(); + NcVarInfo *data_vinfo = _file->find_by_name(req_name.c_str()); if (level.type() == LevelType_Time) { - + mlog << Error << "\n" << method_name + << "LevelType_Time for unstructured grid is not enabled\n\n"; + exit(1); + /* Not enabled LongArray time_offsets = collect_time_offsets(vinfo); if (0 < time_offsets.n_elements()) { - lvl_lower = level.lower(); - lvl_upper = level.upper(); - for (int idx=0; idx vinfo_list; + if (_file->find_nc_vinfo_list(req_name.c_str(), vinfo_list)) { + for (int idx=0; idxname.c_str()); + if (vlevel >= lvl_lower && vlevel <= lvl_upper) { + vinfo.set_req_name(vinfo_list[idx]->name.c_str()); + if (data_plane(vinfo, plane, vinfo_list[idx])) { + plane_array.add(plane, lvl_lower, lvl_upper); + n_rec++; + } + mlog << Debug(5) << method_name + << "Found range match for VarInfo \"" << req_name + << " (" << vinfo_list[idx]->name << ")\"\n"; + } } } - - //if (mlog.verbosity_level() >= debug_level) { - // for (int idx=0; idx< vertical_offsets.n_elements(); idx++ ) { - // mlog << Debug(debug_level) << method_name << "vertical: " - // << _file->vlevels[vertical_offsets[idx]] - // << " from index " << vertical_offsets[idx] << "\n"; - // } - //} + else { + mlog << Error << "\n" << method_name + << "Can not find variables which begin with \"" << req_name + << "\"\n\n"; + exit(1); + } + } + else { + // NOT SUPPORTED??? } } else { // if (level.type() == LevelType_None) { - if (data_plane(vinfo, plane)) { + if (lvl_lower != lvl_upper && nullptr != data_vinfo) { + int tmp_lower = lvl_lower; + int tmp_upper = lvl_upper; + int z_offset = bad_data_int; + if (data_vinfo->z_slot >= 0) { + int zdim_size = get_dim_size(data_vinfo->var, data_vinfo->z_slot); + if (tmp_lower >= zdim_size) tmp_lower = zdim_size - 1; + if (tmp_upper >= zdim_size) tmp_upper = zdim_size - 1; + } + for (int idx=tmp_lower; idx<=tmp_upper; idx++) { + _cur_vert_index = idx; + if (data_plane(vinfo, plane, data_vinfo)) { + plane_array.add(plane, lvl_lower, lvl_upper); + n_rec++; + } + } + } + else if (data_plane(vinfo, plane)) { plane_array.add(plane, lvl_lower, lvl_upper); n_rec++; } } - - return(n_rec); + return n_rec; } //////////////////////////////////////////////////////////////////////// @@ -619,6 +634,7 @@ LongArray MetUGridDataFile::collect_time_offsets(VarInfo &vinfo) { //////////////////////////////////////////////////////////////////////// +/* LongArray MetUGridDataFile::collect_vertical_offsets(VarInfo &vinfo) { int n_rec = 0; bool status = false; @@ -757,23 +773,21 @@ LongArray MetUGridDataFile::collect_vertical_offsets(VarInfo &vinfo) { else error_code = error_code_unknown; } - /* - int z_count = vertical_offsets.n_elements(); - if (0 < z_count) - mlog << Debug(7) << method_name << " Found " << z_count - << (z_count==1 ? " vertical" : " verticals") << " between " - << _file->vlevels[0] << " and " - << _file->vlevels[z_dim_size-1] << "\n"; - else { - mlog << Warning << method_name << "Not found vertical out of " - << z_dim_size << ".\n"; - if (include_all_verticals) error_code = error_code_empty_verticals; - else if (is_vert_range) { - error_code = z_as_value ? error_code_missing_vert_values - : error_code_missing_vert_offsets; - } - } - */ +// int z_count = vertical_offsets.n_elements(); +// if (0 < z_count) +// mlog << Debug(7) << method_name << " Found " << z_count +// << (z_count==1 ? " vertical" : " verticals") << " between " +// << _file->vlevels[0] << " and " +// << _file->vlevels[z_dim_size-1] << "\n"; +// else { +// mlog << Warning << method_name << "Not found vertical out of " +// << z_dim_size << ".\n"; +// if (include_all_verticals) error_code = error_code_empty_verticals; +// else if (is_vert_range) { +// error_code = z_as_value ? error_code_missing_vert_values +// : error_code_missing_vert_offsets; +// } +// } // Handling error code if (error_code > error_code_no_error) { @@ -827,21 +841,7 @@ LongArray MetUGridDataFile::collect_vertical_offsets(VarInfo &vinfo) { return(vertical_offsets); } - - -//////////////////////////////////////////////////////////////////////// - -int MetUGridDataFile::index(VarInfo &vinfo){ - - if( nullptr == _file->find_by_name( vinfo.name().c_str() ) ) return -1; - - if( ( vinfo.valid() != 0 && _file->ValidTime[0] != vinfo.valid() ) || - ( vinfo.init() != 0 && _file->InitTime != vinfo.init() ) || - ( !is_bad_data(vinfo.lead()) && _file->lead_time() != vinfo.lead() ) ) - return -1; - - return 0; -} +*/ //////////////////////////////////////////////////////////////////////// @@ -888,6 +888,7 @@ long MetUGridDataFile::convert_time_to_offset(long time_value) { //////////////////////////////////////////////////////////////////////// +/* long MetUGridDataFile::convert_value_to_offset(double z_value, string z_dim_name) { bool found = false; long z_offset = bad_data_int; @@ -913,6 +914,137 @@ long MetUGridDataFile::convert_value_to_offset(double z_value, string z_dim_name return z_offset; } +*/ + +//////////////////////////////////////////////////////////////////////// + +int MetUGridDataFile::extract_vlevels(ConcatString var_name_base, const char *var_name) { + int num_mat = 0; + char** mat = nullptr; + int vlevel = bad_data_int; + ConcatString name_pattern; + + name_pattern.erase(); + name_pattern << "(" << var_name_base << "[ _])([0-9]+)(.*)"; + num_mat = regex_apply(name_pattern.c_str(), 4, var_name, mat); + if (2 < num_mat) vlevel = atoi(mat[2]); + + return vlevel; +} + +//////////////////////////////////////////////////////////////////////// + + +long MetUGridDataFile::get_time_offset(long time_value, const long time_cnt, + const char *var_name, const string caller) { + const long time_threshold_cnt = 10000000; + long time_offset = convert_time_to_offset(time_value); + if ((0 > time_offset) || (time_offset >= time_cnt)) { + if (time_value > time_threshold_cnt) // from time string (yyyymmdd_hh) + mlog << Warning << "\n" << caller << "the requested time " + << unix_to_yyyymmdd_hhmmss(time_value) << " for \"" + << var_name << "\" variable does not exist (" + << unix_to_yyyymmdd_hhmmss(_file->ValidTime[0]) << " and " + << unix_to_yyyymmdd_hhmmss(_file->ValidTime[time_cnt-1]) << ").\n\n"; + else + mlog << Warning << "\n" << caller << "the requested time value " + << time_value << " for \"" << var_name << "\" variable " + << "is out of range (between 0 and " << (time_cnt-1) << ").\n\n"; + time_offset = -1; + } + return time_offset; +} + +//////////////////////////////////////////////////////////////////////// + +int MetUGridDataFile::index(VarInfo &vinfo){ + + if( nullptr == _file->find_by_name( vinfo.name().c_str() ) ) return -1; + + if( ( vinfo.valid() != 0 && _file->ValidTime[0] != vinfo.valid() ) || + ( vinfo.init() != 0 && _file->InitTime != vinfo.init() ) || + ( !is_bad_data(vinfo.lead()) && _file->lead_time() != vinfo.lead() ) ) + return -1; + + return 0; +} + +//////////////////////////////////////////////////////////////////////// + +bool MetUGridDataFile::read_data_plane(ConcatString var_name, VarInfo &vinfo, + DataPlane &plane, LongArray &dimension) { + static const string method_name + = "MetUGridDataFile::read_data_plane() -> "; + + // Read the data + NcVarInfo *info = (NcVarInfo *) nullptr; + + bool status = _file->getData(var_name.c_str(), + dimension, + plane, info); + + //if (org_time_offset != bad_data_int && 0 <= time_dim_slot) + // dimension[time_dim_slot] = org_time_offset; + //if (org_z_offset != bad_data_int && 0 <= zdim_slot) + // dimension[zdim_slot] = org_z_offset; + + // Check that the times match those requested + + if (status) + { + // Check that the valid time matches the request + + if (vinfo.valid() > 0 && vinfo.valid() != plane.valid()) + { + // Compute time strings + + ConcatString req_time_str = unix_to_yyyymmdd_hhmmss(vinfo.valid()); + ConcatString data_time_str = unix_to_yyyymmdd_hhmmss(plane.valid()); + + mlog << Warning << "\n" << method_name + << "for \"" << vinfo.req_name() << "\" variable, the valid " + << "time does not match the requested valid time: (" + << data_time_str << " != " << req_time_str << ")\n\n"; + status = false; + } + + // Check that the lead time matches the request + + if (vinfo.lead() > 0 && vinfo.lead() != plane.lead()) + { + // Compute time strings + + ConcatString req_time_str = sec_to_hhmmss(vinfo.lead()); + ConcatString data_time_str = sec_to_hhmmss(plane.lead()); + + mlog << Warning << "\n" << method_name + << "for \"" << vinfo.req_name() << "\" variable, the lead " + << "time does not match the requested lead time: (" + << data_time_str << " != " << req_time_str << ")\n\n"; + status = false; + } + + status = process_data_plane(&vinfo, plane); + + // Set the VarInfo object's name, long_name, level, and units strings + + if (info->name_att.length() > 0) + vinfo.set_name(info->name_att); + else + vinfo.set_name(info->name); + + if (info->long_name_att.length() > 0) + vinfo.set_long_name(info->long_name_att.c_str()); + + if (info->level_att.length() > 0) + vinfo.set_level_name(info->level_att.c_str()); + + if (info->units_att.length() > 0) + vinfo.set_units(info->units_att.c_str()); + } + + return status; +} //////////////////////////////////////////////////////////////////////// diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.h b/src/libcode/vx_data2d_ugrid/data2d_ugrid.h index 4fc70e6e7e..2e6d200903 100644 --- a/src/libcode/vx_data2d_ugrid/data2d_ugrid.h +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.h @@ -34,9 +34,11 @@ class MetUGridDataFile : public Met2dDataFile { void ugrid_init_from_scratch(); //NcVarInfo *find_first_data_var(); long convert_time_to_offset(long time_value); - long convert_value_to_offset(double z_value, std::string z_dim_name); + //long convert_value_to_offset(double z_value, std::string z_dim_name); LongArray collect_time_offsets(VarInfo &vinfo); - LongArray collect_vertical_offsets(VarInfo &vinfo); + //LongArray collect_vertical_offsets(VarInfo &vinfo); + long get_time_offset(long time_value, const long time_cnt, + const char *var_name, const std::string caller); MetUGridDataFile(const MetUGridDataFile &); MetUGridDataFile & operator=(const MetUGridDataFile &); @@ -86,6 +88,7 @@ class MetUGridDataFile : public Met2dDataFile { // retrieve the first matching data plane bool data_plane(VarInfo &, DataPlane &); + bool data_plane(VarInfo &, DataPlane &, NcVarInfo *); // retrieve all matching data planes @@ -93,8 +96,12 @@ class MetUGridDataFile : public Met2dDataFile { // retrieve the index of the first matching record + int extract_vlevels(ConcatString var_name_base, const char *var_name); + int index(VarInfo &); + bool read_data_plane(ConcatString var_name, VarInfo &vinfo, + DataPlane &plane, LongArray &dimension); // // do stuff From bcf7d4ab95ca86e78a267a10b2b53038b044ff91 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Wed, 1 Nov 2023 13:02:30 -0600 Subject: [PATCH 048/109] #2231 Allow an ugrid data as observation --- src/tools/core/grid_stat/grid_stat.cc | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/tools/core/grid_stat/grid_stat.cc b/src/tools/core/grid_stat/grid_stat.cc index 19431244a4..74f2f2bc72 100644 --- a/src/tools/core/grid_stat/grid_stat.cc +++ b/src/tools/core/grid_stat/grid_stat.cc @@ -306,7 +306,20 @@ void process_command_line(int argc, char **argv) { if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; ugrid_mtddf->open_metadata(ugrid_nc.c_str()); mlog << Debug(9) << method_name - << "ugrid_coordinates_nc: " << ugrid_nc + << "FCST: ugrid_coordinates_nc: " << ugrid_nc + << " ugrid_max_distance_km: " << conf_info.ugrid_max_distance_km << "\n"; + } + if (FileType_UGrid == otype) { + ConcatString ugrid_nc = conf_info.ugrid_nc; + ConcatString ugrid_user_map_config = conf_info.ugrid_user_map_config; + MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)obs_mtddf; + ugrid_mtddf->set_max_distance_km(conf_info.ugrid_max_distance_km); + if (0 < ugrid_user_map_config.length()) + ugrid_mtddf->set_user_map_config_file(ugrid_user_map_config); + if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; + ugrid_mtddf->open_metadata(ugrid_nc.c_str()); + mlog << Debug(9) << method_name + << "OBS: ugrid_coordinates_nc: " << ugrid_nc << " ugrid_max_distance_km: " << conf_info.ugrid_max_distance_km << "\n"; } #endif From c8edf904be1ef83a9520e0abb93d5f6de2cee7fd Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Wed, 1 Nov 2023 13:03:26 -0600 Subject: [PATCH 049/109] #2231 Removed _xCoordVar and _yCoordVar --- src/libcode/vx_data2d_ugrid/ugrid_file.cc | 59 ++++++++--------------- src/libcode/vx_data2d_ugrid/ugrid_file.h | 2 - 2 files changed, 21 insertions(+), 40 deletions(-) diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.cc b/src/libcode/vx_data2d_ugrid/ugrid_file.cc index f1c50fdad4..24fa81849e 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.cc +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.cc @@ -98,8 +98,6 @@ void UGridFile::init_from_scratch() _tDim = (NcDim *)nullptr; _latVar = (NcVar *)nullptr; _lonVar = (NcVar *)nullptr; - _xCoordVar = (NcVar *)nullptr; - _yCoordVar = (NcVar *)nullptr; max_distance_km = bad_data_double; // Close any existing file @@ -266,8 +264,21 @@ bool UGridFile::open_metadata(const char * filepath) NcVar *z_var = (NcVar *)nullptr; NcVar *valid_time_var = (NcVar *)nullptr; - get_var_names(_ncMetaFile, &var_names); + StringArray time_names = get_metadata_names(COORD_VAR_KEYS[0]); + StringArray lat_names = get_metadata_names(COORD_VAR_KEYS[1]); + StringArray lon_names = get_metadata_names(COORD_VAR_KEYS[2]); + StringArray z_names = get_metadata_names(COORD_VAR_KEYS[3]); + for (int j=0; j Date: Wed, 1 Nov 2023 13:04:02 -0600 Subject: [PATCH 050/109] #2231 cleanup --- src/libcode/vx_data2d_ugrid/data2d_ugrid.cc | 73 ++++++--------------- 1 file changed, 21 insertions(+), 52 deletions(-) diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc index db9b41dab5..651d1f8da5 100644 --- a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc @@ -181,58 +181,29 @@ bool MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane) data_var = _file->find_by_name(vinfo_nc->req_name().c_str()); if (nullptr != data_var) { - int zdim_slot = data_var->z_slot; - int time_dim_slot = data_var->t_slot; - NumArray dim_value = vinfo_nc->dim_value(); - LongArray dimension(vinfo_nc->dimension()); - BoolArray is_offset(vinfo_nc->is_offset()); - for (int idx=0; idx time_offset) || (time_offset >= time_cnt)) { - time_offset = convert_time_to_offset(time_offset); - } - if ((0 > time_offset) || (time_offset >= time_cnt)) { - mlog << Error << "\n" << method_name << "the requested time offset " - << time_offset << " for \"" << vinfo.req_name() << "\" variable " - << "is out of range (between 0 and " << (time_cnt-1) << ").\n\n"; - return false; - } - dimension[time_dim_slot] = time_offset; - } - else if (idx == zdim_slot) { - const long z_cnt = (long)get_dim_size(_file->get_vert_dim()); - long z_offset = dim_offset; - if (z_offset == range_flag) z_offset = _cur_vert_index; // from data_plane_array() - //else if (!is_offset[idx]) { - // // convert the value to index for slicing - // z_offset = convert_value_to_offset(dim_value[idx], z_dim_name); - //} - if ((z_offset >= 0) && (z_offset < z_cnt)) { - dimension[idx] = long(z_offset); + // Read the data + status = data_plane(vinfo, plane, data_var); + } + else { + LevelInfo level = vinfo.level(); + long lvl_lower = level.lower(); + long lvl_upper = level.upper(); + vector vinfo_list; + if (_file->find_nc_vinfo_list(vinfo_nc->req_name().c_str(), vinfo_list)) { + for (int idx=0; idxreq_name(), vinfo_list[idx]->name.c_str()); + if (vlevel >= lvl_lower && vlevel <= lvl_upper) { + vinfo.set_req_name(vinfo_list[idx]->name.c_str()); + status = data_plane(vinfo, plane, vinfo_list[idx]); + if (status) { + mlog << Debug(5) << method_name + << "Found range match for VarInfo \"" << vinfo_nc->req_name() + << " (" << vinfo_list[idx]->name << ")\"\n"; + break; + } } - //else { - // if (is_offset[idx]) - // mlog << Error << "\n" << method_name << "the requested vertical offset " - // << dim_offset << " for \"" << vinfo.req_name() << "\" variable " - // << "is out of range (between 0 and " << (z_cnt-1) << ").\n\n"; - // else - // mlog << Error << "\n" << method_name << "the requested vertical value " - // << dim_value[idx] << " for \"" << vinfo.req_name() << "\" variable " - // << "does not exist (data size = " << z_cnt << ").\n\n"; - // return false; - //} } } - // Read the data - status = read_data_plane(vinfo.req_name(), vinfo, plane, dimension); } return status; @@ -259,8 +230,6 @@ bool MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane, NcVarInfo *d int zdim_slot = bad_data_int; int time_dim_slot = bad_data_int; -// long org_time_offset = bad_data_int; -// long org_z_offset = bad_data_int; NumArray dim_value = vinfo_nc->dim_value(); LongArray dimension(vinfo_nc->dimension()); BoolArray is_offset(vinfo_nc->is_offset()); @@ -269,7 +238,7 @@ bool MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane, NcVarInfo *d zdim_slot = data_var->z_slot; time_dim_slot = data_var->t_slot; - // Adjust didmension and is_offset + // Adjust dimension and is_offset int dim_size = dimension.n_elements(); if (0 == dimension.n_elements()) { for (int idx=0; idxNdims; idx++) { From 4720b303024009f2f37aaa040fd6326ed3935502 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Wed, 1 Nov 2023 13:07:16 -0600 Subject: [PATCH 051/109] #2231 Initial release --- .../config/GridStatConfig_ugrid_mpas | 266 +++++++++++++++++ .../config/GridStatConfig_ugrid_mpas_diag | 268 ++++++++++++++++++ .../config/PointStatConfig_ugrid_mpas_diag | 171 +++++++++++ .../config/PointStatConfig_ugrid_mpas_out | 172 +++++++++++ internal/test_unit/xml/unit_ugrid.xml | 125 ++++++++ 5 files changed, 1002 insertions(+) create mode 100644 internal/test_unit/config/GridStatConfig_ugrid_mpas create mode 100644 internal/test_unit/config/GridStatConfig_ugrid_mpas_diag create mode 100644 internal/test_unit/config/PointStatConfig_ugrid_mpas_diag create mode 100644 internal/test_unit/config/PointStatConfig_ugrid_mpas_out create mode 100644 internal/test_unit/xml/unit_ugrid.xml diff --git a/internal/test_unit/config/GridStatConfig_ugrid_mpas b/internal/test_unit/config/GridStatConfig_ugrid_mpas new file mode 100644 index 0000000000..d811ad56da --- /dev/null +++ b/internal/test_unit/config/GridStatConfig_ugrid_mpas @@ -0,0 +1,266 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Grid-Stat configuration file. +// +// For additional information, please see the MET User's Guide. +// +//////////////////////////////////////////////////////////////////////////////// + +// +// Output model name to be written +// +model = "GFS"; + +// +// Output description to be written +// May be set separately in each "obs.field" entry +// +desc = "NA"; + +// +// Output observation type to be written +// +obtype = "GFS-ANL"; + +//////////////////////////////////////////////////////////////////////////////// + +// +// Verification grid +// +regrid = { + to_grid = "${CLIMO_MEAN_FILE}"; + method = BILIN; + width = 2; + vld_thresh = 0.5; + shape = SQUARE; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// May be set separately in each "field" entry +// +censor_thresh = []; +censor_val = []; +mpr_column = []; +mpr_thresh = []; +cat_thresh = []; +cnt_thresh = [ NA ]; +cnt_logic = UNION; +wind_thresh = [ >5.0 ]; +wind_logic = UNION; +eclv_points = 0.05; +nc_pairs_var_name = ""; +nc_pairs_var_suffix = ""; +hss_ec_value = NA; +rank_corr_flag = FALSE; + +// +// Forecast and observation fields to be verified +// +fcst = { + file_type = NETCDF_UGRID; + + level = [ "P500" ]; + + field = [ + { name = "t2m"; } + ]; +} +obs = { + + level = [ "P500" ]; + + field = [ + { name = "TMP"; } + ]; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Climatology data +// +climo_mean = obs; +climo_mean = { + + file_name = [ "${CLIMO_MEAN_FILE}" ]; + + regrid = { + method = NEAREST; + width = 1; + vld_thresh = 0.5; + shape = SQUARE; + } + + time_interp_method = DW_MEAN; + day_interval = 31; + hour_interval = 6; +} + +climo_stdev = climo_mean; +climo_stdev = { + file_name = []; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Verification masking regions +// +mask = { + grid = [ "FULL" ]; + poly = [ ]; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Confidence interval settings +// +ci_alpha = [ 0.05 ]; + +boot = { + interval = PCTILE; + rep_prop = 1.0; + n_rep = 0; + rng = "mt19937"; + seed = "1"; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Data smoothing methods +// +interp = { + field = BOTH; + vld_thresh = 1.0; + shape = SQUARE; + + type = [ + { + method = NEAREST; + width = 1; + } + ]; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Neighborhood methods +// +nbrhd = { + width = [ 1 ]; + cov_thresh = [ >=0.5 ]; + vld_thresh = 1.0; + shape = SQUARE; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Fourier decomposition +// +fourier = { + wave_1d_beg = [ 0, 0, 4, 10 ]; + wave_1d_end = [ 72, 3, 9, 20 ]; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Gradient statistics +// May be set separately in each "obs.field" entry +// +gradient = { + dx = [ 1 ]; + dy = [ 1 ]; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Distance Map statistics +// May be set separately in each "obs.field" entry +// +distance_map = { + baddeley_p = 2; + baddeley_max_dist = NA; + fom_alpha = 0.1; + zhu_weight = 0.5; + beta_value(n) = n * n / 2.0; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Statistical output types +// +output_flag = { + fho = NONE; + ctc = NONE; + cts = NONE; + mctc = NONE; + mcts = NONE; + cnt = STAT; + sl1l2 = STAT; + sal1l2 = STAT; + vl1l2 = STAT; + val1l2 = STAT; + vcnt = STAT; + pct = NONE; + pstd = NONE; + pjc = NONE; + prc = NONE; + eclv = NONE; + nbrctc = NONE; + nbrcts = NONE; + nbrcnt = NONE; + grad = NONE; + dmap = NONE; + seeps = NONE; +} + +// +// NetCDF matched pairs output file +// +nc_pairs_flag = { + latlon = TRUE; + raw = TRUE; + diff = TRUE; + climo = TRUE; + climo_cdp = FALSE; + weight = FALSE; + nbrhd = FALSE; + fourier = TRUE; + gradient = FALSE; + distance_map = FALSE; + apply_mask = FALSE; +} + +//////////////////////////////////////////////////////////////////////////////// +// Threshold for SEEPS p1 (Probability of being dry) + +seeps_p1_thresh = NA; + +//////////////////////////////////////////////////////////////////////////////// +// Unstructured Grid (optional) +// - ugrid_max_distance_km: The closest neighbor should be less or equal to ugrid_max_distance_km. +// Accept all if ugrid_max_distance_km is equal or less than 0. +// - ugrid_user_map_config: the user defined configuration file for ugrid_metadata_map +// - ugrid_coordinates_file: NetCDF file name which contains coordinate variables for unstructured grid. + +ugrid_max_distance_km = 30; +//ugrid_user_map_config = ""; +ugrid_coordinates_file = "${MET_TEST_INPUT}/ugrid_data/mpas/static.40962_reduced.nc"; + +//////////////////////////////////////////////////////////////////////////////// + +grid_weight_flag = NONE; +tmp_dir = "/tmp"; +output_prefix = "${OUTPUT_PREFIX}"; +version = "V12.0.0"; + +//////////////////////////////////////////////////////////////////////////////// diff --git a/internal/test_unit/config/GridStatConfig_ugrid_mpas_diag b/internal/test_unit/config/GridStatConfig_ugrid_mpas_diag new file mode 100644 index 0000000000..e9b8a3629a --- /dev/null +++ b/internal/test_unit/config/GridStatConfig_ugrid_mpas_diag @@ -0,0 +1,268 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Grid-Stat configuration file. +// +// For additional information, please see the MET User's Guide. +// +//////////////////////////////////////////////////////////////////////////////// + +// +// Output model name to be written +// +model = "GFS"; + +// +// Output description to be written +// May be set separately in each "obs.field" entry +// +desc = "NA"; + +// +// Output observation type to be written +// +obtype = "GFS-ANL"; + +//////////////////////////////////////////////////////////////////////////////// + +// +// Verification grid +// +regrid = { + to_grid = "${CLIMO_MEAN_FILE}"; + method = BILIN; + width = 2; + vld_thresh = 0.5; + shape = SQUARE; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// May be set separately in each "field" entry +// +censor_thresh = []; +censor_val = []; +mpr_column = []; +mpr_thresh = []; +cat_thresh = []; +cnt_thresh = [ NA ]; +cnt_logic = UNION; +wind_thresh = [ >5.0 ]; +wind_logic = UNION; +eclv_points = 0.05; +nc_pairs_var_name = ""; +nc_pairs_var_suffix = ""; +hss_ec_value = NA; +rank_corr_flag = FALSE; + +// +// Forecast and observation fields to be verified +// +fcst = { + file_type = NETCDF_UGRID; + + level = [ "P925" ]; + + field = [ + { name = "temperature"; } + ]; +} +obs = { + file_type = NETCDF_UGRID; + + level = [ "L3" ]; + + field = [ + { name = "theta"; } + ]; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Climatology data +// +//climo_mean = fcst; +//climo_mean = { +// +// file_name = [ "${CLIMO_MEAN_FILE}" ]; +// +// regrid = { +// method = NEAREST; +// width = 1; +// vld_thresh = 0.5; +// shape = SQUARE; +// } +// +// time_interp_method = DW_MEAN; +// day_interval = 31; +// hour_interval = 6; +//} +// +//climo_stdev = climo_mean; +//climo_stdev = { +// file_name = []; +//} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Verification masking regions +// +mask = { + grid = [ "FULL" ]; + poly = [ ]; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Confidence interval settings +// +ci_alpha = [ 0.05 ]; + +boot = { + interval = PCTILE; + rep_prop = 1.0; + n_rep = 0; + rng = "mt19937"; + seed = "1"; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Data smoothing methods +// +interp = { + field = BOTH; + vld_thresh = 1.0; + shape = SQUARE; + + type = [ + { + method = NEAREST; + width = 1; + } + ]; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Neighborhood methods +// +nbrhd = { + width = [ 1 ]; + cov_thresh = [ >=0.5 ]; + vld_thresh = 1.0; + shape = SQUARE; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Fourier decomposition +// +fourier = { + wave_1d_beg = [ 0, 0, 4, 10 ]; + wave_1d_end = [ 72, 3, 9, 20 ]; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Gradient statistics +// May be set separately in each "obs.field" entry +// +gradient = { + dx = [ 1 ]; + dy = [ 1 ]; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Distance Map statistics +// May be set separately in each "obs.field" entry +// +distance_map = { + baddeley_p = 2; + baddeley_max_dist = NA; + fom_alpha = 0.1; + zhu_weight = 0.5; + beta_value(n) = n * n / 2.0; +} + +//////////////////////////////////////////////////////////////////////////////// + +// +// Statistical output types +// +output_flag = { + fho = NONE; + ctc = NONE; + cts = NONE; + mctc = NONE; + mcts = NONE; + cnt = STAT; + sl1l2 = STAT; + sal1l2 = STAT; + vl1l2 = STAT; + val1l2 = STAT; + vcnt = STAT; + pct = NONE; + pstd = NONE; + pjc = NONE; + prc = NONE; + eclv = NONE; + nbrctc = NONE; + nbrcts = NONE; + nbrcnt = NONE; + grad = NONE; + dmap = NONE; + seeps = NONE; +} + +// +// NetCDF matched pairs output file +// +nc_pairs_flag = { + latlon = TRUE; + raw = TRUE; + diff = TRUE; + climo = TRUE; + climo_cdp = FALSE; + weight = FALSE; + nbrhd = FALSE; + fourier = TRUE; + gradient = FALSE; + distance_map = FALSE; + apply_mask = FALSE; +} + +//////////////////////////////////////////////////////////////////////////////// +// Threshold for SEEPS p1 (Probability of being dry) + +seeps_p1_thresh = NA; + +//////////////////////////////////////////////////////////////////////////////// +// Unstructured Grid (optional) +// - ugrid_max_distance_km: The closest neighbor should be less or equal to ugrid_max_distance_km. +// Accept all if ugrid_max_distance_km is equal or less than 0. +// - ugrid_user_map_config: the user defined configuration file for ugrid_metadata_map +// - ugrid_coordinates_file: NetCDF file name which contains coordinate variables for unstructured grid. + +ugrid_max_distance_km = 30; +//ugrid_user_map_config = ""; +ugrid_coordinates_file = "${MET_TEST_INPUT}/ugrid_data/mpas/static.40962_reduced.nc"; + + +//////////////////////////////////////////////////////////////////////////////// + +grid_weight_flag = NONE; +tmp_dir = "/tmp"; +output_prefix = "${OUTPUT_PREFIX}"; +version = "V12.0.0"; + +//////////////////////////////////////////////////////////////////////////////// diff --git a/internal/test_unit/config/PointStatConfig_ugrid_mpas_diag b/internal/test_unit/config/PointStatConfig_ugrid_mpas_diag new file mode 100644 index 0000000000..2ce12c97d2 --- /dev/null +++ b/internal/test_unit/config/PointStatConfig_ugrid_mpas_diag @@ -0,0 +1,171 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Point-Stat configuration file. +// +// For additional information, please see the MET User's Guide. +// +//////////////////////////////////////////////////////////////////////////////// + +model = "WRF"; + +// +// Output description to be written +// May be set separately in each "obs.field" entry +// +desc = "NA"; + +//////////////////////////////////////////////////////////////////////////////// + +regrid = { + to_grid = NONE; + method = NEAREST; + width = 1; +} + +//////////////////////////////////////////////////////////////////////////////// + +obs_window = { + beg = ${BEG_DS}; + end = ${END_DS}; +} + +//////////////////////////////////////////////////////////////////////////////// + +mpr_column = []; +mpr_thresh = []; +cnt_thresh = [ NA ]; +cnt_logic = UNION; +wind_thresh = [ NA ]; +wind_logic = UNION; +eclv_points = 0.05; + + +fcst = { + sid_inc = []; + sid_exc = []; + obs_quality_inc = []; + obs_quality_exc = []; + + file_type = NETCDF_UGRID; + field = [ + { name = "temperature"; level = "P1000-500"; message_type = "ADPSFC"; } + ]; + +} + +obs = { + sid_inc = []; + sid_exc = []; + obs_quality_inc = []; + obs_quality_exc = []; + + field = [ + { name = "TMP"; level = "P1000-500"; message_type = "ADPSFC"; } + ]; + +} + +//////////////////////////////////////////////////////////////////////////////// + +climo_mean = obs; +climo_mean = { + file_name = [ ${CLIMO_FILE} ]; +} + +//////////////////////////////////////////////////////////////////////////////// + +mask = { + grid = []; + poly = []; + sid = []; + llpnt = [{ name = "ALLLATLON"; lat_thresh = NA; lon_thresh = NA; }]; +} + +//////////////////////////////////////////////////////////////////////////////// + +ci_alpha = [ 0.05 ]; + +boot = { + interval = PCTILE; + rep_prop = 1.0; + n_rep = 200; + rng = "mt19937"; + seed = "1"; +} + +//////////////////////////////////////////////////////////////////////////////// + +interp = { + vld_thresh = 1.0; + + type = [ + { + method = NEAREST; + width = 1; + } + ]; +} + +//////////////////////////////////////////////////////////////////////////////// + +hira = { + flag = FALSE; + width = [ 2, 3, 4, 5 ]; + vld_thresh = 1.0; + cov_thresh = [ ==0.25 ]; + shape = SQUARE; + prob_cat_thresh = []; +} + +//////////////////////////////////////////////////////////////////////////////// + +output_flag = { + fho = BOTH; + ctc = BOTH; + cts = BOTH; + mctc = NONE; + mcts = NONE; + cnt = BOTH; + sl1l2 = BOTH; + sal1l2 = BOTH; + vl1l2 = BOTH; + val1l2 = BOTH; + vcnt = BOTH; + pct = NONE; + pstd = NONE; + pjc = NONE; + prc = NONE; + ecnt = NONE; + orank = NONE; + rps = NONE; + eclv = BOTH; + mpr = BOTH; + seeps = NONE; + seeps_mpr = NONE; +} + +//////////////////////////////////////////////////////////////////////////////// +// Threshold for SEEPS p1 (Probability of being dry) + +seeps_p1_thresh = NA; + +//////////////////////////////////////////////////////////////////////////////// +// Unstructured Grid (optional) +// - ugrid_max_distance_km: The closest neighbor should be less or equal to ugrid_max_distance_km. +// Accept all if ugrid_max_distance_km is equal or less than 0. +// - ugrid_user_map_config: the user defined configuration file for ugrid_metadata_map +// - ugrid_coordinates_file: NetCDF file name which contains coordinate variables for unstructured grid. + +ugrid_max_distance_km = 30; +//ugrid_user_map_config = ""; +ugrid_coordinates_file = "${MET_TEST_INPUT}/ugrid_data/mpas/static.40962_reduced.nc"; + +//////////////////////////////////////////////////////////////////////////////// + +duplicate_flag = NONE; +rank_corr_flag = TRUE; +tmp_dir = "/tmp"; +output_prefix = "${OUTPUT_PREFIX}"; +version = "V12.0.0"; + +//////////////////////////////////////////////////////////////////////////////// diff --git a/internal/test_unit/config/PointStatConfig_ugrid_mpas_out b/internal/test_unit/config/PointStatConfig_ugrid_mpas_out new file mode 100644 index 0000000000..95ebb7b0df --- /dev/null +++ b/internal/test_unit/config/PointStatConfig_ugrid_mpas_out @@ -0,0 +1,172 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Point-Stat configuration file. +// +// For additional information, please see the MET User's Guide. +// +//////////////////////////////////////////////////////////////////////////////// + +model = "WRF"; + +// +// Output description to be written +// May be set separately in each "obs.field" entry +// +desc = "NA"; + +//////////////////////////////////////////////////////////////////////////////// + +regrid = { + to_grid = NONE; + method = NEAREST; + width = 1; +} + +//////////////////////////////////////////////////////////////////////////////// + +obs_window = { + beg = ${BEG_DS}; + end = ${END_DS}; +} + +//////////////////////////////////////////////////////////////////////////////// + +mpr_column = []; +mpr_thresh = []; +cnt_thresh = [ NA ]; +cnt_logic = UNION; +wind_thresh = [ NA ]; +wind_logic = UNION; +eclv_points = 0.05; + + +fcst = { + sid_inc = []; + sid_exc = []; + obs_quality_inc = []; + obs_quality_exc = []; + + file_type = NETCDF_UGRID; + field = [ + { name = "theta"; level = "(0,*,2-4)"; message_type = "ADPSFC"; } +// { name = "theta"; level = "L4-6"; message_type = "ADPSFC"; } + ]; + +} + +obs = { + sid_inc = []; + sid_exc = []; + obs_quality_inc = []; + obs_quality_exc = []; + + field = [ + { name = "TMP"; level = "P1000-500"; message_type = "ADPSFC"; } + ]; + +} + +//////////////////////////////////////////////////////////////////////////////// + +climo_mean = obs; +climo_mean = { + file_name = [ ${CLIMO_FILE} ]; +} + +//////////////////////////////////////////////////////////////////////////////// + +mask = { + grid = []; + poly = []; + sid = []; + llpnt = [{ name = "ALLLATLON"; lat_thresh = NA; lon_thresh = NA; }]; +} + +//////////////////////////////////////////////////////////////////////////////// + +ci_alpha = [ 0.05 ]; + +boot = { + interval = PCTILE; + rep_prop = 1.0; + n_rep = 200; + rng = "mt19937"; + seed = "1"; +} + +//////////////////////////////////////////////////////////////////////////////// + +interp = { + vld_thresh = 1.0; + + type = [ + { + method = NEAREST; + width = 1; + } + ]; +} + +//////////////////////////////////////////////////////////////////////////////// + +hira = { + flag = FALSE; + width = [ 2, 3, 4, 5 ]; + vld_thresh = 1.0; + cov_thresh = [ ==0.25 ]; + shape = SQUARE; + prob_cat_thresh = []; +} + +//////////////////////////////////////////////////////////////////////////////// + +output_flag = { + fho = BOTH; + ctc = BOTH; + cts = BOTH; + mctc = NONE; + mcts = NONE; + cnt = BOTH; + sl1l2 = BOTH; + sal1l2 = BOTH; + vl1l2 = BOTH; + val1l2 = BOTH; + vcnt = BOTH; + pct = NONE; + pstd = NONE; + pjc = NONE; + prc = NONE; + ecnt = NONE; + orank = NONE; + rps = NONE; + eclv = BOTH; + mpr = BOTH; + seeps = NONE; + seeps_mpr = NONE; +} + +//////////////////////////////////////////////////////////////////////////////// +// Threshold for SEEPS p1 (Probability of being dry) + +seeps_p1_thresh = NA; + +//////////////////////////////////////////////////////////////////////////////// +// Unstructured Grid (optional) +// - ugrid_max_distance_km: The closest neighbor should be less or equal to ugrid_max_distance_km. +// Accept all if ugrid_max_distance_km is equal or less than 0. +// - ugrid_user_map_config: the user defined configuration file for ugrid_metadata_map +// - ugrid_coordinates_file: NetCDF file name which contains coordinate variables for unstructured grid. + +ugrid_max_distance_km = 30; +//ugrid_user_map_config = ""; +ugrid_coordinates_file = "${MET_TEST_INPUT}/ugrid_data/mpas/static.40962_reduced.nc"; + +//////////////////////////////////////////////////////////////////////////////// + +duplicate_flag = NONE; +rank_corr_flag = TRUE; +tmp_dir = "/tmp"; +output_prefix = "${OUTPUT_PREFIX}"; +version = "V12.0.0"; + +//////////////////////////////////////////////////////////////////////////////// diff --git a/internal/test_unit/xml/unit_ugrid.xml b/internal/test_unit/xml/unit_ugrid.xml new file mode 100644 index 0000000000..822d02bbe9 --- /dev/null +++ b/internal/test_unit/xml/unit_ugrid.xml @@ -0,0 +1,125 @@ + + + + + + + + + + + +]> + + + + + + + + + + + &MET_BIN;/grid_stat + + CLIMO_MEAN_FILE &DATA_DIR_CLIMO;/NCEP_2.5deg/pgba_mean.19590415 + OUTPUT_PREFIX UGRID_MPAS_OUT_TO_GRID + + \ + &DATA_DIR_UGRID;/mpas/mpasout.2012-04-09_12.00.00_reduced.nc \ + &DATA_DIR_MODEL;/grib2/gfsanl/gfsanl_4_20120409_1200_000.grb2 \ + &CONFIG_DIR;/GridStatConfig_ugrid_mpas \ + -outdir &OUTPUT_DIR;/grid_stat_ugrid -v 1 + + + &OUTPUT_DIR;/grid_stat_ugrid/grid_stat_UGRID_MPAS_OUT_TO_GRID_000000L_20120409_120000V.stat + + + + + + &MET_BIN;/grid_stat + + CLIMO_MEAN_FILE &DATA_DIR_CLIMO;/NCEP_2.5deg/pgba_mean.19590415 + OUTPUT_PREFIX UGRID_MPAS_DIAG + + \ + &DATA_DIR_UGRID;/mpas/diag.2012-04-09_12.00.00_reduced.nc \ + &DATA_DIR_UGRID;/mpas/mpasout.2012-04-09_12.00.00_reduced.nc \ + &CONFIG_DIR;/GridStatConfig_ugrid_mpas_diag \ + -outdir &OUTPUT_DIR;/grid_stat_ugrid -v 1 + + + &OUTPUT_DIR;/grid_stat_ugrid/grid_stat_UGRID_MPAS_DIAG_000000L_20120409_120000V.stat + + + + + + + + + + + + &MET_BIN;/point_stat + + BEG_DS -1800 + END_DS 1800 + OUTPUT_PREFIX UGRID_MPAS_DIAG_TEMP + CONFIG_DIR &CONFIG_DIR; + CLIMO_FILE "&DATA_DIR_MODEL;/grib1/gfs/gfs_2012040900_F012_gNam.grib" + + \ + &DATA_DIR_UGRID;/mpas/diag.2012-04-09_12.00.00_reduced.nc \ + &OUTPUT_DIR;/pb2nc/gdas1.20120409.t12z.prepbufr.nc \ + &CONFIG_DIR;/PointStatConfig_ugrid_mpas_diag \ + -outdir &OUTPUT_DIR;/point_stat_ugrid -v 1 + + + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V.stat + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_fho.txt + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_ctc.txt + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_cts.txt + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_cnt.txt + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_sl1l2.txt + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_sal1l2.txt + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_eclv.txt + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_mpr.txt + + + + + &MET_BIN;/point_stat + + BEG_DS -1800 + END_DS 1800 + OUTPUT_PREFIX UGRID_MPAS_OUT_TEMP + CONFIG_DIR &CONFIG_DIR; + CLIMO_FILE "&DATA_DIR_MODEL;/grib1/gfs/gfs_2012040900_F012_gNam.grib" + + \ + &DATA_DIR_UGRID;/mpas/mpasout.2012-04-09_12.00.00_reduced.nc \ + &OUTPUT_DIR;/pb2nc/gdas1.20120409.t12z.prepbufr.nc \ + &CONFIG_DIR;/PointStatConfig_ugrid_mpas_out \ + -outdir &OUTPUT_DIR;/point_stat_ugrid -v 1 + + + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V.stat + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_fho.txt + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_ctc.txt + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_cts.txt + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_cnt.txt + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_sl1l2.txt + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_sal1l2.txt + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_eclv.txt + &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_mpr.txt + + + + From 1da9fa245121156377663793f5aa2cf339b028f5 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Wed, 1 Nov 2023 13:12:29 -0600 Subject: [PATCH 052/109] #2231 Added unit_ugrid.xml --- internal/test_unit/bin/unit_test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/test_unit/bin/unit_test.sh b/internal/test_unit/bin/unit_test.sh index caf28047ab..0867e5e1df 100755 --- a/internal/test_unit/bin/unit_test.sh +++ b/internal/test_unit/bin/unit_test.sh @@ -101,6 +101,8 @@ UNIT_XML="unit_ascii2nc.xml \ unit_grid_diag.xml \ unit_quality_filter.xml" +UNIT_XML="$UNIT_XML unit_ugrid.xml" + # Run each unit test for CUR_XML in ${UNIT_XML}; do From d9c29b2d6b00d3fcd84d91eafb9c7012e7edc418 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Wed, 1 Nov 2023 15:14:00 -0600 Subject: [PATCH 053/109] #2231 Added unit_ugrid.xml --- internal/test_unit/bin/unit_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/test_unit/bin/unit_test.sh b/internal/test_unit/bin/unit_test.sh index 0867e5e1df..0f0493720f 100755 --- a/internal/test_unit/bin/unit_test.sh +++ b/internal/test_unit/bin/unit_test.sh @@ -101,7 +101,7 @@ UNIT_XML="unit_ascii2nc.xml \ unit_grid_diag.xml \ unit_quality_filter.xml" -UNIT_XML="$UNIT_XML unit_ugrid.xml" +UNIT_XML="${UNIT_XML} unit_ugrid.xml" # Run each unit test for CUR_XML in ${UNIT_XML}; do From af99457d54d43f353ff54a78e3a55a1f0794f291 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Fri, 3 Nov 2023 10:19:14 -0600 Subject: [PATCH 054/109] #2231 Switched the grid_nc tag to the exists tag --- internal/test_unit/xml/unit_ugrid.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/internal/test_unit/xml/unit_ugrid.xml b/internal/test_unit/xml/unit_ugrid.xml index 822d02bbe9..29834d70e4 100644 --- a/internal/test_unit/xml/unit_ugrid.xml +++ b/internal/test_unit/xml/unit_ugrid.xml @@ -34,9 +34,7 @@ &OUTPUT_DIR;/grid_stat_ugrid/grid_stat_UGRID_MPAS_OUT_TO_GRID_000000L_20120409_120000V.stat - + &OUTPUT_DIR;/grid_stat_ugrid/grid_stat_UGRID_MPAS_OUT_TO_GRID_000000L_20120409_120000V_pairs.nc @@ -54,9 +52,7 @@ &OUTPUT_DIR;/grid_stat_ugrid/grid_stat_UGRID_MPAS_DIAG_000000L_20120409_120000V.stat - + &OUTPUT_DIR;/grid_stat_ugrid/grid_stat_UGRID_MPAS_DIAG_000000L_20120409_120000V_pairs.nc From adc9828395b615ed911859160fa09cfdb5961579 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Mon, 6 Nov 2023 11:52:22 -0700 Subject: [PATCH 055/109] Rename UGridConfig_default to UGridConfig_default_mpas --- data/config/{UGridConfig_default => UGridConfig_default_mpas} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename data/config/{UGridConfig_default => UGridConfig_default_mpas} (100%) diff --git a/data/config/UGridConfig_default b/data/config/UGridConfig_default_mpas similarity index 100% rename from data/config/UGridConfig_default rename to data/config/UGridConfig_default_mpas From b74591248d8dc4099306e813b376e35d9d9a6662 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Mon, 6 Nov 2023 12:22:45 -0700 Subject: [PATCH 056/109] Rename UGridConfig_default_mpas to UGridConfig_mpas --- data/config/{UGridConfig_default_mpas => UGridConfig_mpas} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename data/config/{UGridConfig_default_mpas => UGridConfig_mpas} (100%) diff --git a/data/config/UGridConfig_default_mpas b/data/config/UGridConfig_mpas similarity index 100% rename from data/config/UGridConfig_default_mpas rename to data/config/UGridConfig_mpas From 66a0e9d7c2e2886d9ba2811ef75a7137ff4c3617 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Mon, 6 Nov 2023 13:55:08 -0700 Subject: [PATCH 057/109] #2231 Disable the ugrid test target --- scripts/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile b/scripts/Makefile index 2081261e28..6660bff06f 100755 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -34,7 +34,7 @@ export TEST_OUT_DIR ## -TESTS := $(shell grep "define ENABLE_" ../config.h | grep -v "ENABLE_PYTHON" | cut -d" " -f2 | cut -b8- | tr A-Z a-z) +TESTS := $(shell grep "define ENABLE_" ../config.h | grep -v "ENABLE_PYTHON" | grep -v "ENABLE_UGRID" | cut -d" " -f2 | cut -b8- | tr A-Z a-z) ######################################################################## From d613bebb24135acc0f91b1637765a854a06af6a6 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 7 Nov 2023 11:24:33 -0700 Subject: [PATCH 058/109] #2231 Added ugrid_dataset and renamed ugrid_user_map_config to ugrid_map_configugrid_map_config --- src/basic/vx_config/config_constants.h | 3 ++- src/basic/vx_config/config_util.cc | 24 ++++++++++++++++-------- src/basic/vx_config/config_util.h | 5 +++-- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/basic/vx_config/config_constants.h b/src/basic/vx_config/config_constants.h index 336bca9f89..446bf7c895 100644 --- a/src/basic/vx_config/config_constants.h +++ b/src/basic/vx_config/config_constants.h @@ -681,9 +681,10 @@ static const char conf_key_control_id[] = "control_id"; static const char conf_key_ens_member_ids[] = "ens_member_ids"; static const char conf_key_seeps_p1_thresh[] = "seeps_p1_thresh"; static const char conf_key_ugrid_coordinates_file[] = "ugrid_coordinates_file"; +static const char conf_key_ugrid_dataset[] = "ugrid_dataset"; +static const char conf_key_ugrid_map_config[] = "ugrid_map_config"; static const char conf_key_ugrid_max_distance_km[] = "ugrid_max_distance_km"; static const char conf_key_ugrid_metadata_map[] = "ugrid_metadata_map"; -static const char conf_key_ugrid_user_map_config[] = "ugrid_user_map_config"; // // Entries to override file metadata diff --git a/src/basic/vx_config/config_util.cc b/src/basic/vx_config/config_util.cc index d88097deb3..4d2240afb5 100644 --- a/src/basic/vx_config/config_util.cc +++ b/src/basic/vx_config/config_util.cc @@ -2260,6 +2260,20 @@ WaveletType parse_conf_wavelet_type(Dictionary *dict) { return t; } + +/////////////////////////////////////////////////////////////////////////////// + + +ConcatString parse_conf_ugrid_coordinates_file(Dictionary *dict) { + return dict ? dict->lookup_string(conf_key_ugrid_coordinates_file, false) : ""; +} + +/////////////////////////////////////////////////////////////////////////////// + +ConcatString parse_conf_ugrid_dataset(Dictionary *dict) { + return dict ? dict->lookup_string(conf_key_ugrid_dataset, false) : ""; +} + /////////////////////////////////////////////////////////////////////////////// double parse_conf_ugrid_max_distance_km(Dictionary *dict) { @@ -2268,8 +2282,8 @@ double parse_conf_ugrid_max_distance_km(Dictionary *dict) { /////////////////////////////////////////////////////////////////////////////// -ConcatString parse_conf_ugrid_coordinates_file(Dictionary *dict) { - return dict ? dict->lookup_string(conf_key_ugrid_coordinates_file, false) : ""; +ConcatString parse_conf_ugrid_map_config(Dictionary *dict) { + return dict ? dict->lookup_string(conf_key_ugrid_map_config, false) : ""; } /////////////////////////////////////////////////////////////////////////////// @@ -2279,12 +2293,6 @@ map parse_conf_ugrid_metadata_map(Dictionary *dict) { return parse_conf_key_values_map(dict, conf_key_ugrid_metadata_map, method_name); } -/////////////////////////////////////////////////////////////////////////////// - -ConcatString parse_conf_ugrid_user_map_config(Dictionary *dict) { - return dict ? dict->lookup_string(conf_key_ugrid_user_map_config, false) : ""; -} - /////////////////////////////////////////////////////////////////////////////// diff --git a/src/basic/vx_config/config_util.h b/src/basic/vx_config/config_util.h index 71435e1a3e..20d6381aa2 100644 --- a/src/basic/vx_config/config_util.h +++ b/src/basic/vx_config/config_util.h @@ -85,9 +85,10 @@ extern void parse_conf_range_int(Dictionary *dict, int &beg, int &end extern void parse_conf_range_double(Dictionary *dict, double &beg, double &end); extern StringArray parse_conf_ens_member_ids(Dictionary *dict); extern NormalizeType parse_conf_normalize(Dictionary *dict); -extern double parse_conf_ugrid_max_distance_km(Dictionary *dict); -extern ConcatString parse_conf_ugrid_user_map_config(Dictionary *dict); extern ConcatString parse_conf_ugrid_coordinates_file(Dictionary *dict); +extern ConcatString parse_conf_ugrid_dataset(Dictionary *dict); +extern ConcatString parse_conf_ugrid_map_config(Dictionary *dict); +extern double parse_conf_ugrid_max_distance_km(Dictionary *dict); extern std::map parse_conf_ugrid_metadata_map(Dictionary *dict); extern void check_mask_names(const StringArray &); From 9d5878445bd85d843bd0cd28fb48ed3b271f4fe1 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 7 Nov 2023 11:28:40 -0700 Subject: [PATCH 059/109] #2231 Support ugrid_dataset --- src/libcode/vx_data2d_ugrid/data2d_ugrid.cc | 10 ++- src/libcode/vx_data2d_ugrid/data2d_ugrid.h | 3 +- src/libcode/vx_data2d_ugrid/ugrid_file.cc | 78 ++++++++++++++------- src/libcode/vx_data2d_ugrid/ugrid_file.h | 7 +- 4 files changed, 65 insertions(+), 33 deletions(-) diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc index 651d1f8da5..fa1c5831f1 100644 --- a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc @@ -1017,14 +1017,20 @@ bool MetUGridDataFile::read_data_plane(ConcatString var_name, VarInfo &vinfo, //////////////////////////////////////////////////////////////////////// +void MetUGridDataFile::set_dataset(ConcatString dataset_name) { + _file->set_dataset(dataset_name); +} + +//////////////////////////////////////////////////////////////////////// + void MetUGridDataFile::set_max_distance_km(double max_distance) { _file->set_max_distance_km(max_distance); } //////////////////////////////////////////////////////////////////////// -void MetUGridDataFile::set_user_map_config_file(ConcatString filename) { - _file->set_user_map_config_file(filename); +void MetUGridDataFile::set_map_config_file(ConcatString filename) { + _file->set_map_config_file(filename); } diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.h b/src/libcode/vx_data2d_ugrid/data2d_ugrid.h index 2e6d200903..2e4fd74eb5 100644 --- a/src/libcode/vx_data2d_ugrid/data2d_ugrid.h +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.h @@ -109,8 +109,9 @@ class MetUGridDataFile : public Met2dDataFile { bool open (const char * filename); bool open_metadata(const char * filename); + void set_dataset(ConcatString dataset_name); + void set_map_config_file(ConcatString filename); void set_max_distance_km(double max_distance); - void set_user_map_config_file(ConcatString filename); void close (); diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.cc b/src/libcode/vx_data2d_ugrid/ugrid_file.cc index 24fa81849e..fc45971372 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.cc +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.cc @@ -36,8 +36,8 @@ using namespace netCDF; //////////////////////////////////////////////////////////////////////// static const char *def_user_config = "UGridConfig_user"; -static const char *def_config_filename = - "MET_BASE/config/UGridConfig_default"; +static const char *def_config_prefix = "UGridConfig_"; +static const char *def_config_prefix2 = "MET_BASE/config/UGridConfig_"; array DIM_KEYS = { "dim_face", "dim_node", "dim_edge", "dim_time", "dim_vert" @@ -98,6 +98,7 @@ void UGridFile::init_from_scratch() _tDim = (NcDim *)nullptr; _latVar = (NcVar *)nullptr; _lonVar = (NcVar *)nullptr; + metadata_map.clear(); max_distance_km = bad_data_double; // Close any existing file @@ -168,13 +169,8 @@ bool UGridFile::open(const char * filepath) { const char *method_name = "UGridFile::open() -> "; - // Close any open files and clear out the associated members close(); - ConcatString config_file = file_exists(def_user_config) - ? def_user_config : def_config_filename; - read_config(config_file); - if (_ncFile) { delete _ncFile; _ncFile = (NcFile *) nullptr; @@ -202,9 +198,6 @@ bool UGridFile::open_metadata(const char * filepath) int sec_per_unit; const char *method_name = "UGridFile::open_metadata() -> "; - // FIXME: Commented out with NetCDF4 enabling - // NcError err(NcError::silent_nonfatal); - // Open the file _ncMetaFile = open_ncfile(filepath); @@ -857,7 +850,7 @@ int UGridFile::lead_time() const //////////////////////////////////////////////////////////////////////// -void UGridFile::read_config(ConcatString config_filename) { +void UGridFile::read_config(ConcatString config_filename, bool do_override) { const char *method_name = "UGridFile::read_config() "; MetConfig conf; @@ -866,15 +859,20 @@ void UGridFile::read_config(ConcatString config_filename) { << "configuration from " << config_filename << " (" << replace_path(config_filename) << ")\n"; conf.read(replace_path(config_filename).c_str()); - metadata_map = parse_conf_ugrid_metadata_map(&conf); - metadata_names.clear(); - for (std::map::iterator it=metadata_map.begin(); - it!=metadata_map.end(); ++it) { - metadata_names.add(it->second); + if (do_override || bad_data_double == max_distance_km) { + max_distance_km = parse_conf_ugrid_max_distance_km(&conf); } + if (do_override || 0 == metadata_map.size()) { + metadata_map = parse_conf_ugrid_metadata_map(&conf); + metadata_names.clear(); + for (std::map::iterator it=metadata_map.begin(); + it!=metadata_map.end(); ++it) { + metadata_names.add(it->second); + } - mlog << Debug(6) << method_name - << "map size: " << metadata_map.size() << ", dims_vars_count = " << metadata_names.n() << "\n"; + mlog << Debug(6) << method_name + << "map size: " << metadata_map.size() << ", dims_vars_count = " << metadata_names.n() << "\n"; + } } @@ -942,28 +940,40 @@ void UGridFile::read_netcdf_grid() //////////////////////////////////////////////////////////////////////// -void UGridFile::set_max_distance_km(double max_distance) { +void UGridFile::set_dataset(ConcatString _dataset_name, bool do_override) { - max_distance_km = max_distance; - if (grid.is_set()) { - UnstructuredData D; - D.copy_from(grid.info().us); - D.max_distance_km = max_distance; - grid.set(D); + const char *ugrid_config_name = nullptr; + + dataset_name = _dataset_name; + ConcatString dataset_config(def_config_prefix); + dataset_config.add(dataset_name); + ugrid_config_name = replace_path(dataset_config.c_str()).c_str(); + if (!file_exists(ugrid_config_name)) { + dataset_config = def_config_prefix2; + dataset_config.add(dataset_name); + ugrid_config_name = replace_path(dataset_config.c_str()).c_str(); + } + if (file_exists(ugrid_config_name)) { + read_config(ugrid_config_name, do_override); + } + else { + mlog << Error << "\nUGridFile::set_dataset()" + << " The UGrid dataset \"" << dataset_name << "\" is not supported.\n\n"; + exit(1); } } //////////////////////////////////////////////////////////////////////// -void UGridFile::set_user_map_config_file(ConcatString filename) { +void UGridFile::set_map_config_file(ConcatString filename) { if (file_exists(filename.c_str())) { read_config(filename.c_str()); get_var_info(); } else { - mlog << Error << "\nUGridFile::set_user_map_config_file()" + mlog << Error << "\nUGridFile::set_map_config_file()" << " The UGrid metadata mapping configuration file \"" << filename << "\" does not exist.\n\n"; exit(1); @@ -972,3 +982,17 @@ void UGridFile::set_user_map_config_file(ConcatString filename) { } //////////////////////////////////////////////////////////////////////// + +void UGridFile::set_max_distance_km(double max_distance) { + + max_distance_km = max_distance; + if (grid.is_set()) { + UnstructuredData D; + D.copy_from(grid.info().us); + D.max_distance_km = max_distance; + grid.set(D); + } + +} + +//////////////////////////////////////////////////////////////////////// diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.h b/src/libcode/vx_data2d_ugrid/ugrid_file.h index 7675790f6b..e04df55447 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.h +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.h @@ -46,8 +46,9 @@ class UGridFile { bool open(const char *filename); bool open_metadata(const char *filename); bool get_var_info(); + void set_dataset(ConcatString _dataset_name, bool do_override=false); + void set_map_config_file(ConcatString filename); void set_max_distance_km(double max_distance); - void set_user_map_config_file(ConcatString filename); void close(); @@ -119,8 +120,8 @@ class UGridFile { std::map metadata_map; StringArray metadata_names; + ConcatString dataset_name; double max_distance_km; - // // dimensions // @@ -161,7 +162,7 @@ class UGridFile { std::string find_metadata_name(std::string &key, StringArray &available_names); StringArray get_metadata_names(std::string &key); - void read_config(ConcatString config_filename); + void read_config(ConcatString config_filename, bool do_override=true); void read_netcdf_grid(); }; From 23cc52f03c80bee272cd933e6d1f4175f4172707 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 7 Nov 2023 11:30:16 -0700 Subject: [PATCH 060/109] #2231 Support optiolnal -config option and ugrid_dataset --- src/tools/core/grid_stat/grid_stat.cc | 30 +++++++++++++++---- src/tools/core/grid_stat/grid_stat.h | 1 + .../core/grid_stat/grid_stat_conf_info.cc | 25 ++++++++++++++-- .../core/grid_stat/grid_stat_conf_info.h | 6 ++-- src/tools/core/point_stat/point_stat.cc | 23 ++++++++++++-- src/tools/core/point_stat/point_stat.h | 1 + .../core/point_stat/point_stat_conf_info.cc | 25 ++++++++++++++-- .../core/point_stat/point_stat_conf_info.h | 5 +++- 8 files changed, 98 insertions(+), 18 deletions(-) diff --git a/src/tools/core/grid_stat/grid_stat.cc b/src/tools/core/grid_stat/grid_stat.cc index 74f2f2bc72..d50c376d61 100644 --- a/src/tools/core/grid_stat/grid_stat.cc +++ b/src/tools/core/grid_stat/grid_stat.cc @@ -191,6 +191,7 @@ static void finish_txt_files(); static void clean_up(); static void usage(); +static void set_config(const StringArray &); static void set_outdir(const StringArray &); static void set_compress(const StringArray &); static bool read_data_plane(VarInfo* info, DataPlane& dp, Met2dDataFile* mtddf, @@ -269,6 +270,7 @@ void process_command_line(int argc, char **argv) { // Read the config files conf_info.read_config(default_config_file.c_str(), config_file.c_str()); + conf_info.read_configs(config_files); // Get the forecast and observation file types from config, if present ftype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_fcst)); @@ -298,11 +300,14 @@ void process_command_line(int argc, char **argv) { #ifdef WITH_UGRID if (FileType_UGrid == ftype) { ConcatString ugrid_nc = conf_info.ugrid_nc; - ConcatString ugrid_user_map_config = conf_info.ugrid_user_map_config; + ConcatString ugrid_dataset = conf_info.ugrid_dataset; + ConcatString ugrid_map_config = conf_info.ugrid_map_config; MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)fcst_mtddf; ugrid_mtddf->set_max_distance_km(conf_info.ugrid_max_distance_km); - if (0 < ugrid_user_map_config.length()) - ugrid_mtddf->set_user_map_config_file(ugrid_user_map_config); + if (0 < ugrid_dataset.length()) + ugrid_mtddf->set_dataset(ugrid_dataset); + if (0 < ugrid_map_config.length()) + ugrid_mtddf->set_map_config_file(ugrid_map_config); if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; ugrid_mtddf->open_metadata(ugrid_nc.c_str()); mlog << Debug(9) << method_name @@ -311,11 +316,14 @@ void process_command_line(int argc, char **argv) { } if (FileType_UGrid == otype) { ConcatString ugrid_nc = conf_info.ugrid_nc; - ConcatString ugrid_user_map_config = conf_info.ugrid_user_map_config; + ConcatString ugrid_dataset = conf_info.ugrid_dataset; + ConcatString ugrid_map_config = conf_info.ugrid_map_config; MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)obs_mtddf; ugrid_mtddf->set_max_distance_km(conf_info.ugrid_max_distance_km); - if (0 < ugrid_user_map_config.length()) - ugrid_mtddf->set_user_map_config_file(ugrid_user_map_config); + if (0 < ugrid_dataset.length()) + ugrid_mtddf->set_dataset(ugrid_dataset); + if (0 < ugrid_map_config.length()) + ugrid_mtddf->set_map_config_file(ugrid_map_config); if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; ugrid_mtddf->open_metadata(ugrid_nc.c_str()); mlog << Debug(9) << method_name @@ -3079,6 +3087,9 @@ void usage() { << "\t\t\"config_file\" is a GridStatConfig file containing " << "the desired configuration settings (required).\n" + << "\t\t\"-config config_file\" specifies additional PointStatConfig file containing " + << "the configuration settings for unstructured grid (optional).\n" + << "\t\t\"-outdir path\" overrides the default output directory " << "(" << out_dir << ") (optional).\n" @@ -3096,6 +3107,13 @@ void usage() { //////////////////////////////////////////////////////////////////////// +void set_config(const StringArray & a) +{ + config_files.add(a[0]); +} + +//////////////////////////////////////////////////////////////////////// + void set_outdir(const StringArray & a) { out_dir = a[0]; } diff --git a/src/tools/core/grid_stat/grid_stat.h b/src/tools/core/grid_stat/grid_stat.h index 7e6e5efd9c..eb659f5841 100644 --- a/src/tools/core/grid_stat/grid_stat.h +++ b/src/tools/core/grid_stat/grid_stat.h @@ -113,6 +113,7 @@ static ConcatString obs_file; // Input Config file static ConcatString config_file; +static StringArray config_files; static GridStatConfInfo conf_info; // Optional arguments diff --git a/src/tools/core/grid_stat/grid_stat_conf_info.cc b/src/tools/core/grid_stat/grid_stat_conf_info.cc index 426cef0e29..e8afd2994c 100644 --- a/src/tools/core/grid_stat/grid_stat_conf_info.cc +++ b/src/tools/core/grid_stat/grid_stat_conf_info.cc @@ -69,7 +69,8 @@ void GridStatConfInfo::clear() { version.clear(); #ifdef WITH_UGRID ugrid_nc.clear(); - ugrid_user_map_config.clear(); + ugrid_dataset.clear(); + ugrid_map_config.clear(); ugrid_max_distance_km = bad_data_double; #endif @@ -108,6 +109,21 @@ void GridStatConfInfo::read_config(const char *default_file_name, //////////////////////////////////////////////////////////////////////// +void GridStatConfInfo::read_configs(StringArray user_file_names) { + + const char *file_name; + for (int i=0; i " + << "The configuration file \"" << user_file_names[i]<< "\" does not exist.\n\n"; + } + + return; +} + +//////////////////////////////////////////////////////////////////////// + void GridStatConfInfo::process_config(GrdFileType ftype, GrdFileType otype) { int i, j, n_fvx, n_ovx; @@ -137,11 +153,14 @@ void GridStatConfInfo::process_config(GrdFileType ftype, tmp_dir = parse_conf_tmp_dir(&conf); #ifdef WITH_UGRID + // Conf: ugrid_dataset + ugrid_map_config = parse_conf_ugrid_dataset(&conf); + // Conf: ugrid_nc ugrid_nc = parse_conf_ugrid_coordinates_file(&conf); - // Conf: ugrid_user_map_config - ugrid_user_map_config = parse_conf_ugrid_user_map_config(&conf); + // Conf: ugrid_map_config + ugrid_map_config = parse_conf_ugrid_map_config(&conf); // Conf: ugrid_max_distance_km ugrid_max_distance_km = parse_conf_ugrid_max_distance_km(&conf); diff --git a/src/tools/core/grid_stat/grid_stat_conf_info.h b/src/tools/core/grid_stat/grid_stat_conf_info.h index 6a48ffb05c..81d0054b08 100644 --- a/src/tools/core/grid_stat/grid_stat_conf_info.h +++ b/src/tools/core/grid_stat/grid_stat_conf_info.h @@ -284,8 +284,9 @@ class GridStatConfInfo { ConcatString output_prefix; // String to customize output file name ConcatString version; // Config file version #ifdef WITH_UGRID - ConcatString ugrid_nc; // NetCDF for coordinate variables of unstructured grid - ConcatString ugrid_user_map_config; // User's configuration file which contains ugrid metadata mapping + ConcatString ugrid_nc; // NetCDF for coordinate variables of unstructured grid + ConcatString ugrid_dataset; // UGRid dataset name (mpas, lfric etc) + ConcatString ugrid_map_config; // User's configuration file which contains ugrid metadata mapping double ugrid_max_distance_km; // max distance to be the closest neighbor to unstructured grid #endif @@ -298,6 +299,7 @@ class GridStatConfInfo { void clear(); void read_config (const char *, const char *); + void read_configs (StringArray user_file_names); void process_config(GrdFileType, GrdFileType); void process_flags (); void process_masks (const Grid &); diff --git a/src/tools/core/point_stat/point_stat.cc b/src/tools/core/point_stat/point_stat.cc index 5d57a45799..4df4fa41a8 100644 --- a/src/tools/core/point_stat/point_stat.cc +++ b/src/tools/core/point_stat/point_stat.cc @@ -175,6 +175,7 @@ static void finish_txt_files(); static void clean_up(); static void usage(); +static void set_config(const StringArray &); static void set_point_obs(const StringArray &); static void set_ncfile(const StringArray &); static void set_obs_valid_beg_time(const StringArray &); @@ -239,6 +240,7 @@ void process_command_line(int argc, char **argv) { cline.set_usage(usage); // Add the options function calls + cline.add(set_config, "-config", 1); cline.add(set_point_obs, "-point_obs", 1); cline.add(set_ncfile, "-ncfile", 1); cline.add(set_obs_valid_beg_time, "-obs_valid_beg", 1); @@ -281,6 +283,7 @@ void process_command_line(int argc, char **argv) { // Read the config files conf_info.read_config(default_config_file.c_str(), config_file.c_str()); + conf_info.read_configs(config_files); // Get the forecast file type from config, if present ftype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_fcst)); @@ -304,11 +307,14 @@ void process_command_line(int argc, char **argv) { #ifdef WITH_UGRID if (FileType_UGrid == ftype) { ConcatString ugrid_nc = conf_info.ugrid_nc; - ConcatString ugrid_user_map_config = conf_info.ugrid_user_map_config; + ConcatString ugrid_dataset = conf_info.ugrid_dataset; + ConcatString ugrid_map_config = conf_info.ugrid_map_config; MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)fcst_mtddf; ugrid_mtddf->set_max_distance_km(conf_info.ugrid_max_distance_km); - if (0 < ugrid_user_map_config.length()) - ugrid_mtddf->set_user_map_config_file(ugrid_user_map_config); + if (0 < ugrid_dataset.length()) + ugrid_mtddf->set_dataset(ugrid_dataset); + if (0 < ugrid_map_config.length()) + ugrid_mtddf->set_map_config_file(ugrid_map_config); if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; ugrid_mtddf->open_metadata(ugrid_nc.c_str()); mlog << Debug(9) << method_name @@ -2181,6 +2187,7 @@ void usage() { << "\tfcst_file\n" << "\tobs_file\n" << "\tconfig_file\n" + << "\t[-config config_file]\n" << "\t[-point_obs file]\n" << "\t[-obs_valid_beg time]\n" << "\t[-obs_valid_end time]\n" @@ -2197,6 +2204,9 @@ void usage() { << "\t\t\"config_file\" is a PointStatConfig file containing " << "the desired configuration settings (required).\n" + << "\t\t\"-config config_file\" specifies additional PointStatConfig file containing " + << "the configuration settings for unstructured grid (optional).\n" + << "\t\t\"-point_obs file\" specifies additional NetCDF point " << "observation files to be used (optional).\n" @@ -2220,6 +2230,13 @@ void usage() { //////////////////////////////////////////////////////////////////////// +void set_config(const StringArray & a) +{ + config_files.add(a[0]); +} + +//////////////////////////////////////////////////////////////////////// + void set_point_obs(const StringArray & a) { obs_file.add(a[0]); diff --git a/src/tools/core/point_stat/point_stat.h b/src/tools/core/point_stat/point_stat.h index 52fcc9a884..7162861dfd 100644 --- a/src/tools/core/point_stat/point_stat.h +++ b/src/tools/core/point_stat/point_stat.h @@ -108,6 +108,7 @@ static StringArray obs_file; // Input Config file static ConcatString config_file; +static StringArray config_files; static PointStatConfInfo conf_info; // Optional arguments diff --git a/src/tools/core/point_stat/point_stat_conf_info.cc b/src/tools/core/point_stat/point_stat_conf_info.cc index f086b52f84..ed094ef601 100644 --- a/src/tools/core/point_stat/point_stat_conf_info.cc +++ b/src/tools/core/point_stat/point_stat_conf_info.cc @@ -73,7 +73,8 @@ void PointStatConfInfo::clear() { version.clear(); #ifdef WITH_UGRID ugrid_nc.clear(); - ugrid_user_map_config.clear(); + ugrid_dataset.clear(); + ugrid_map_config.clear(); ugrid_max_distance_km = bad_data_double; #endif // Deallocate memory @@ -104,6 +105,21 @@ void PointStatConfInfo::read_config(const char *default_file_name, //////////////////////////////////////////////////////////////////////// +void PointStatConfInfo::read_configs(StringArray user_file_names) { + + const char *file_name; + for (int i=0; i " + << "The configuration file \"" << user_file_names[i]<< "\" does not exist.\n\n"; + } + + return; +} + +//////////////////////////////////////////////////////////////////////// + void PointStatConfInfo::process_config(GrdFileType ftype) { int i, j, n_fvx, n_ovx; Dictionary *fdict = (Dictionary *) 0; @@ -126,11 +142,14 @@ void PointStatConfInfo::process_config(GrdFileType ftype) { tmp_dir = parse_conf_tmp_dir(&conf); #ifdef WITH_UGRID + // Conf: ugrid_dataset + ugrid_map_config = parse_conf_ugrid_dataset(&conf); + // Conf: ugrid_nc ugrid_nc = parse_conf_ugrid_coordinates_file(&conf); - // Conf: ugrid_user_map_config - ugrid_user_map_config = parse_conf_ugrid_user_map_config(&conf); + // Conf: ugrid_map_config + ugrid_map_config = parse_conf_ugrid_map_config(&conf); // Conf: ugrid_max_distance_km ugrid_max_distance_km = parse_conf_ugrid_max_distance_km(&conf); diff --git a/src/tools/core/point_stat/point_stat_conf_info.h b/src/tools/core/point_stat/point_stat_conf_info.h index d918f537da..26edd2338d 100644 --- a/src/tools/core/point_stat/point_stat_conf_info.h +++ b/src/tools/core/point_stat/point_stat_conf_info.h @@ -248,7 +248,8 @@ class PointStatConfInfo { ConcatString version; // Config file version #ifdef WITH_UGRID ConcatString ugrid_nc; // NetCDF for coordinate variables of unstructured grid - ConcatString ugrid_user_map_config; // User's configuration file which contains ugrid metadata mapping + ConcatString ugrid_dataset; // UGRid dataset name (mpas, lfric etc) + ConcatString ugrid_map_config; // User's configuration file which contains ugrid metadata mapping double ugrid_max_distance_km; // max distance to be the closest neighbor to unstructured grid #endif @@ -260,6 +261,8 @@ class PointStatConfInfo { void clear(); void read_config(const char *, const char *); + void read_configs(StringArray user_file_names); + void process_config(GrdFileType); void process_grib_codes(); void process_flags(); From 76a70067e4988ce2829144f32c98796eac463ba8 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 7 Nov 2023 14:51:30 -0700 Subject: [PATCH 061/109] #2231 Cleanup: 0 to nullptr --- src/tools/core/grid_stat/grid_stat.cc | 48 ++++---- .../core/grid_stat/grid_stat_conf_info.cc | 89 +++++++------- src/tools/core/point_stat/point_stat.cc | 49 ++++---- .../core/point_stat/point_stat_conf_info.cc | 115 +++++++++--------- 4 files changed, 145 insertions(+), 156 deletions(-) diff --git a/src/tools/core/grid_stat/grid_stat.cc b/src/tools/core/grid_stat/grid_stat.cc index d50c376d61..50f253c2cd 100644 --- a/src/tools/core/grid_stat/grid_stat.cc +++ b/src/tools/core/grid_stat/grid_stat.cc @@ -304,8 +304,7 @@ void process_command_line(int argc, char **argv) { ConcatString ugrid_map_config = conf_info.ugrid_map_config; MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)fcst_mtddf; ugrid_mtddf->set_max_distance_km(conf_info.ugrid_max_distance_km); - if (0 < ugrid_dataset.length()) - ugrid_mtddf->set_dataset(ugrid_dataset); + if (0 < ugrid_dataset.length()) ugrid_mtddf->set_dataset(ugrid_dataset); if (0 < ugrid_map_config.length()) ugrid_mtddf->set_map_config_file(ugrid_map_config); if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; @@ -320,8 +319,7 @@ void process_command_line(int argc, char **argv) { ConcatString ugrid_map_config = conf_info.ugrid_map_config; MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)obs_mtddf; ugrid_mtddf->set_max_distance_km(conf_info.ugrid_max_distance_km); - if (0 < ugrid_dataset.length()) - ugrid_mtddf->set_dataset(ugrid_dataset); + if (0 < ugrid_dataset.length()) ugrid_mtddf->set_dataset(ugrid_dataset); if (0 < ugrid_map_config.length()) ugrid_mtddf->set_map_config_file(ugrid_map_config); if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; @@ -432,7 +430,7 @@ void setup_txt_files(unixtime valid_ut, int lead_sec) { max_col += n_header_columns + 1; // Initialize file stream - stat_out = (ofstream *) 0; + stat_out = (ofstream *) nullptr; // Build the file name stat_file << base_name << stat_file_ext; @@ -464,7 +462,7 @@ void setup_txt_files(unixtime valid_ut, int lead_sec) { if(conf_info.output_flag[i] == STATOutputType_Both) { // Initialize file stream - txt_out[i] = (ofstream *) 0; + txt_out[i] = (ofstream *) nullptr; // Build the file name txt_file[i] << base_name << "_" << txt_file_abbr[i] @@ -683,11 +681,11 @@ void process_scores() { DataPlane seeps_dp, seeps_dp_fcat, seeps_dp_ocat; - CTSInfo *cts_info = (CTSInfo *) 0; + CTSInfo *cts_info = (CTSInfo *) nullptr; MCTSInfo mcts_info; - VL1L2Info *vl1l2_info = (VL1L2Info *) 0; + VL1L2Info *vl1l2_info = (VL1L2Info *) nullptr; NBRCNTInfo nbrcnt_info; - NBRCTSInfo *nbrcts_info = (NBRCTSInfo *) 0; + NBRCTSInfo *nbrcts_info = (NBRCTSInfo *) nullptr; GRADInfo grad_info; DMAPInfo dmap_info; @@ -1905,9 +1903,9 @@ void process_scores() { mlog << Debug(2) << "\n" << sep_str << "\n\n"; // Deallocate memory - if(cts_info) { delete [] cts_info; cts_info = (CTSInfo *) 0; } - if(vl1l2_info) { delete [] vl1l2_info; vl1l2_info = (VL1L2Info *) 0; } - if(nbrcts_info) { delete [] nbrcts_info; nbrcts_info = (NBRCTSInfo *) 0; } + if(cts_info) { delete [] cts_info; cts_info = (CTSInfo *) nullptr; } + if(vl1l2_info) { delete [] vl1l2_info; vl1l2_info = (VL1L2Info *) nullptr; } + if(nbrcts_info) { delete [] nbrcts_info; nbrcts_info = (NBRCTSInfo *) nullptr; } return; } @@ -2043,8 +2041,8 @@ void do_mcts(MCTSInfo &mcts_info, int i_vx, void do_cnt_sl1l2(const GridStatVxOpt &vx_opt, const PairDataPoint *pd_ptr) { int i, j, k, n_bin; PairDataPoint pd_thr, pd; - SL1L2Info *sl1l2_info = (SL1L2Info *) 0; - CNTInfo *cnt_info = (CNTInfo *) 0; + SL1L2Info *sl1l2_info = (SL1L2Info *) nullptr; + CNTInfo *cnt_info = (CNTInfo *) nullptr; mlog << Debug(2) << "Computing Scalar Partial Sums and Continuous Statistics.\n"; @@ -2222,8 +2220,8 @@ void do_cnt_sl1l2(const GridStatVxOpt &vx_opt, const PairDataPoint *pd_ptr) { } // end for i (fcnt_ta) // Dealloate memory - if(sl1l2_info) { delete [] sl1l2_info; sl1l2_info = (SL1L2Info *) 0; } - if(cnt_info) { delete [] cnt_info; cnt_info = (CNTInfo *) 0; } + if(sl1l2_info) { delete [] sl1l2_info; sl1l2_info = (SL1L2Info *) nullptr; } + if(cnt_info) { delete [] cnt_info; cnt_info = (CNTInfo *) nullptr; } return; } @@ -2277,7 +2275,7 @@ void do_vl1l2(VL1L2Info *&v_info, int i_vx, void do_pct(const GridStatVxOpt &vx_opt, const PairDataPoint *pd_ptr) { int i, j, k, n_bin; PairDataPoint pd; - PCTInfo *pct_info = (PCTInfo *) 0; + PCTInfo *pct_info = (PCTInfo *) nullptr; mlog << Debug(2) << "Computing Probabilistic Statistics.\n"; @@ -2387,7 +2385,7 @@ void do_pct(const GridStatVxOpt &vx_opt, const PairDataPoint *pd_ptr) { } // end for i (ocnt_ta) // Dealloate memory - if(pct_info) { delete [] pct_info; pct_info = (PCTInfo *) 0; } + if(pct_info) { delete [] pct_info; pct_info = (PCTInfo *) nullptr; } return; } @@ -2819,7 +2817,7 @@ void write_nc(const ConcatString &field_name, const DataPlane &dp, } // end for i // Deallocate and clean up - if(data) { delete [] data; data = (float *) 0; } + if(data) { delete [] data; data = (float *) nullptr; } return; } @@ -2854,8 +2852,8 @@ void write_nbrhd_nc(const DataPlane &fcst_dp, const DataPlane &obs_dp, // Store the apply_mask option apply_mask = conf_info.vx_opt[i_vx].nc_info.do_apply_mask; - float *fcst_data = (float *) 0; - float *obs_data = (float *) 0; + float *fcst_data = (float *) nullptr; + float *obs_data = (float *) nullptr; NcVar fcst_var; NcVar obs_var; @@ -2988,8 +2986,8 @@ void write_nbrhd_nc(const DataPlane &fcst_dp, const DataPlane &obs_dp, } // Deallocate and clean up - if(fcst_data) { delete [] fcst_data; fcst_data = (float *) 0; } - if(obs_data) { delete [] obs_data; obs_data = (float *) 0; } + if(fcst_data) { delete [] fcst_data; fcst_data = (float *) nullptr; } + if(obs_data) { delete [] obs_data; obs_data = (float *) nullptr; } return; } @@ -3053,8 +3051,8 @@ void clean_up() { } // Deallocate memory for data files - if(fcst_mtddf) { delete fcst_mtddf; fcst_mtddf = (Met2dDataFile *) 0; } - if(obs_mtddf) { delete obs_mtddf; obs_mtddf = (Met2dDataFile *) 0; } + if(fcst_mtddf) { delete fcst_mtddf; fcst_mtddf = (Met2dDataFile *) nullptr; } + if(obs_mtddf) { delete obs_mtddf; obs_mtddf = (Met2dDataFile *) nullptr; } // Deallocate memory for the random number generator rng_free(rng_ptr); diff --git a/src/tools/core/grid_stat/grid_stat_conf_info.cc b/src/tools/core/grid_stat/grid_stat_conf_info.cc index e8afd2994c..95bfaab1f4 100644 --- a/src/tools/core/grid_stat/grid_stat_conf_info.cc +++ b/src/tools/core/grid_stat/grid_stat_conf_info.cc @@ -47,7 +47,7 @@ GridStatConfInfo::~GridStatConfInfo() { void GridStatConfInfo::init_from_scratch() { // Initialize pointers - vx_opt = (GridStatVxOpt *) 0; + vx_opt = (GridStatVxOpt *) nullptr; clear(); @@ -82,7 +82,7 @@ void GridStatConfInfo::clear() { output_nc_flag = false; // Deallocate memory - if(vx_opt) { delete [] vx_opt; vx_opt = (GridStatVxOpt *) 0; } + if(vx_opt) { delete [] vx_opt; vx_opt = (GridStatVxOpt *) nullptr; } // Reset counts n_vx = 0; @@ -127,8 +127,8 @@ void GridStatConfInfo::read_configs(StringArray user_file_names) { void GridStatConfInfo::process_config(GrdFileType ftype, GrdFileType otype) { int i, j, n_fvx, n_ovx; - Dictionary *fdict = (Dictionary *) 0; - Dictionary *odict = (Dictionary *) 0; + Dictionary *fdict = (Dictionary *) nullptr; + Dictionary *odict = (Dictionary *) nullptr; Dictionary i_fdict, i_odict; // Dump the contents of the config file @@ -154,7 +154,7 @@ void GridStatConfInfo::process_config(GrdFileType ftype, #ifdef WITH_UGRID // Conf: ugrid_dataset - ugrid_map_config = parse_conf_ugrid_dataset(&conf); + ugrid_dataset = parse_conf_ugrid_dataset(&conf); // Conf: ugrid_nc ugrid_nc = parse_conf_ugrid_coordinates_file(&conf); @@ -298,18 +298,17 @@ void GridStatConfInfo::process_config(GrdFileType ftype, //////////////////////////////////////////////////////////////////////// void GridStatConfInfo::process_flags() { - int i, j; // Initialize - for(i=0; iis_prob(); bool vect_flag = (fcst_info->is_u_wind() && obs_info->is_u_wind()); @@ -1219,42 +1217,37 @@ int GridStatVxOpt::n_txt_row(int i_txt_row) const { exit(1); } - return(n); + return n; } //////////////////////////////////////////////////////////////////////// int GridStatVxOpt::get_n_cnt_thresh() const { - return((!fcst_info || fcst_info->is_prob()) ? - 0 : fcnt_ta.n_elements()); + return (!fcst_info || fcst_info->is_prob()) ? 0 : fcnt_ta.n_elements(); } //////////////////////////////////////////////////////////////////////// int GridStatVxOpt::get_n_cat_thresh() const { - return((!fcst_info || fcst_info->is_prob()) ? - 0 : fcat_ta.n_elements()); + return (!fcst_info || fcst_info->is_prob()) ? 0 : fcat_ta.n_elements(); } //////////////////////////////////////////////////////////////////////// int GridStatVxOpt::get_n_wind_thresh() const { - return((!fcst_info || fcst_info->is_prob()) ? - 0 : fwind_ta.n_elements()); + return (!fcst_info || fcst_info->is_prob()) ? 0 : fwind_ta.n_elements(); } //////////////////////////////////////////////////////////////////////// int GridStatVxOpt::get_n_fprob_thresh() const { - return((!fcst_info || !fcst_info->is_prob()) ? - 0 : fcat_ta.n_elements()); + return (!fcst_info || !fcst_info->is_prob()) ? 0 : fcat_ta.n_elements(); } //////////////////////////////////////////////////////////////////////// int GridStatVxOpt::get_n_oprob_thresh() const { - return((!fcst_info || !fcst_info->is_prob()) ? - 0 : ocat_ta.n_elements()); + return (!fcst_info || !fcst_info->is_prob()) ? 0 : ocat_ta.n_elements(); } diff --git a/src/tools/core/point_stat/point_stat.cc b/src/tools/core/point_stat/point_stat.cc index 4df4fa41a8..9cb7ce9c4a 100644 --- a/src/tools/core/point_stat/point_stat.cc +++ b/src/tools/core/point_stat/point_stat.cc @@ -210,7 +210,7 @@ int met_main(int argc, char *argv[]) { // Close the text files and deallocate memory clean_up(); - return(0); + return 0; } //////////////////////////////////////////////////////////////////////// @@ -311,8 +311,7 @@ void process_command_line(int argc, char **argv) { ConcatString ugrid_map_config = conf_info.ugrid_map_config; MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)fcst_mtddf; ugrid_mtddf->set_max_distance_km(conf_info.ugrid_max_distance_km); - if (0 < ugrid_dataset.length()) - ugrid_mtddf->set_dataset(ugrid_dataset); + if (0 < ugrid_dataset.length()) ugrid_mtddf->set_dataset(ugrid_dataset); if (0 < ugrid_map_config.length()) ugrid_mtddf->set_map_config_file(ugrid_map_config); if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; @@ -371,7 +370,7 @@ void setup_first_pass(const DataPlane &dp, const Grid &data_grid) { //////////////////////////////////////////////////////////////////////// void setup_txt_files() { - int i, j; + int j; int max_col, max_prob_col, max_mctc_col, max_orank_col; int n_prob, n_cat, n_eclv, n_ens; ConcatString base_name; @@ -430,7 +429,7 @@ void setup_txt_files() { ///////////////////////////////////////////////////////////////////// // Loop through output file type - for(i=0; idata_plane_array( @@ -702,7 +701,7 @@ void process_obs_file(int i_nc) { ConcatString hdr_vld_str; ConcatString obs_qty_str; unixtime hdr_ut; - NcFile *obs_in = (NcFile *) 0; + NcFile *obs_in = (NcFile *) nullptr; const char *method_name = "process_obs_file() -> "; // Set flags for vectors @@ -717,7 +716,7 @@ void process_obs_file(int i_nc) { bool use_arr_vars = false; bool use_python = false; MetNcPointObsIn nc_point_obs; - MetPointData *met_point_obs = 0; + MetPointData *met_point_obs = nullptr; // Check for python format string python_command = obs_file[i_nc]; @@ -803,7 +802,7 @@ void process_obs_file(int i_nc) { #endif status = nc_point_obs.read_obs_data(block_size, i_block_start_idx, (float *)obs_arr_block, - obs_qty_idx_block, (char *)0); + obs_qty_idx_block, (char *)nullptr); if (!status) exit(1); int hdr_idx; @@ -923,10 +922,10 @@ void process_scores() { ConcatString cs; // Initialize pointers - PairDataPoint *pd_ptr = (PairDataPoint *) 0; - CTSInfo *cts_info = (CTSInfo *) 0; + PairDataPoint *pd_ptr = (PairDataPoint *) nullptr; + CTSInfo *cts_info = (CTSInfo *) nullptr; MCTSInfo mcts_info; - VL1L2Info *vl1l2_info = (VL1L2Info *) 0; + VL1L2Info *vl1l2_info = (VL1L2Info *) nullptr; mlog << Debug(2) << "\n" << sep_str << "\n\n"; @@ -1319,8 +1318,8 @@ void process_scores() { } // end for i // Deallocate memory - if(cts_info) { delete [] cts_info; cts_info = (CTSInfo *) 0; } - if(vl1l2_info) { delete [] vl1l2_info; vl1l2_info = (VL1L2Info *) 0; } + if(cts_info) { delete [] cts_info; cts_info = (CTSInfo *) nullptr; } + if(vl1l2_info) { delete [] vl1l2_info; vl1l2_info = (VL1L2Info *) nullptr; } return; } @@ -1434,8 +1433,8 @@ void do_mcts(MCTSInfo &mcts_info, int i_vx, const PairDataPoint *pd_ptr) { void do_cnt_sl1l2(const PointStatVxOpt &vx_opt, const PairDataPoint *pd_ptr) { int i, j, k, n_bin; PairDataPoint pd_thr, pd; - SL1L2Info *sl1l2_info = (SL1L2Info *) 0; - CNTInfo *cnt_info = (CNTInfo *) 0; + SL1L2Info *sl1l2_info = (SL1L2Info *) nullptr; + CNTInfo *cnt_info = (CNTInfo *) nullptr; mlog << Debug(2) << "Computing Scalar Partial Sums and Continuous Statistics.\n"; @@ -1612,8 +1611,8 @@ void do_cnt_sl1l2(const PointStatVxOpt &vx_opt, const PairDataPoint *pd_ptr) { } // end for i (fcnt_ta) // Dealloate memory - if(sl1l2_info) { delete [] sl1l2_info; sl1l2_info = (SL1L2Info *) 0; } - if(cnt_info) { delete [] cnt_info; cnt_info = (CNTInfo *) 0; } + if(sl1l2_info) { delete [] sl1l2_info; sl1l2_info = (SL1L2Info *) nullptr; } + if(cnt_info) { delete [] cnt_info; cnt_info = (CNTInfo *) nullptr; } return; } @@ -1668,7 +1667,7 @@ void do_vl1l2(VL1L2Info *&v_info, int i_vx, void do_pct(const PointStatVxOpt &vx_opt, const PairDataPoint *pd_ptr) { int i, j, k, n_bin; PairDataPoint pd; - PCTInfo *pct_info = (PCTInfo *) 0; + PCTInfo *pct_info = (PCTInfo *) nullptr; mlog << Debug(2) << "Computing Probabilistic Statistics.\n"; @@ -1778,7 +1777,7 @@ void do_pct(const PointStatVxOpt &vx_opt, const PairDataPoint *pd_ptr) { } // end for i (ocnt_ta) // Dealloate memory - if(pct_info) { delete [] pct_info; pct_info = (PCTInfo *) 0; } + if(pct_info) { delete [] pct_info; pct_info = (PCTInfo *) nullptr; } return; } @@ -1869,7 +1868,7 @@ void do_hira_ens(int i_vx, const PairDataPoint *pd_ptr) { // Check for zero matched pairs if(hira_pd.o_na.n() == 0) { - if(gt) { delete gt; gt = 0; } + if(gt) { delete gt; gt = nullptr; } continue; } @@ -1936,7 +1935,7 @@ void do_hira_ens(int i_vx, const PairDataPoint *pd_ptr) { << "\"" << conf_key_prob_cat_thresh << "\" thresholds are " << "defined in the \"" << conf_key_hira << "\" dictionary.\n"; - if(gt) { delete gt; gt = 0; } + if(gt) { delete gt; gt = nullptr; } break; } @@ -1949,7 +1948,7 @@ void do_hira_ens(int i_vx, const PairDataPoint *pd_ptr) { txt_at[i_rps], i_txt_row[i_rps]); } // end if RPS - if(gt) { delete gt; gt = 0; } + if(gt) { delete gt; gt = nullptr; } } // end for i @@ -2168,7 +2167,7 @@ void clean_up() { finish_txt_files(); // Deallocate memory for data files - if(fcst_mtddf) { delete fcst_mtddf; fcst_mtddf = (Met2dDataFile *) 0; } + if(fcst_mtddf) { delete fcst_mtddf; fcst_mtddf = (Met2dDataFile *) nullptr; } // Deallocate memory for the random number generator rng_free(rng_ptr); diff --git a/src/tools/core/point_stat/point_stat_conf_info.cc b/src/tools/core/point_stat/point_stat_conf_info.cc index ed094ef601..3c1611a0ea 100644 --- a/src/tools/core/point_stat/point_stat_conf_info.cc +++ b/src/tools/core/point_stat/point_stat_conf_info.cc @@ -47,7 +47,7 @@ PointStatConfInfo::~PointStatConfInfo() { void PointStatConfInfo::init_from_scratch() { // Initialize pointers - vx_opt = (PointStatVxOpt *) 0; + vx_opt = (PointStatVxOpt *) nullptr; clear(); @@ -78,7 +78,7 @@ void PointStatConfInfo::clear() { ugrid_max_distance_km = bad_data_double; #endif // Deallocate memory - if(vx_opt) { delete [] vx_opt; vx_opt = (PointStatVxOpt *) 0; } + if(vx_opt) { delete [] vx_opt; vx_opt = (PointStatVxOpt *) nullptr; } // Set count to zero n_vx = 0; @@ -122,8 +122,8 @@ void PointStatConfInfo::read_configs(StringArray user_file_names) { void PointStatConfInfo::process_config(GrdFileType ftype) { int i, j, n_fvx, n_ovx; - Dictionary *fdict = (Dictionary *) 0; - Dictionary *odict = (Dictionary *) 0; + Dictionary *fdict = (Dictionary *) nullptr; + Dictionary *odict = (Dictionary *) nullptr; Dictionary i_fdict, i_odict; // Dump the contents of the config file @@ -143,7 +143,7 @@ void PointStatConfInfo::process_config(GrdFileType ftype) { #ifdef WITH_UGRID // Conf: ugrid_dataset - ugrid_map_config = parse_conf_ugrid_dataset(&conf); + ugrid_dataset = parse_conf_ugrid_dataset(&conf); // Conf: ugrid_nc ugrid_nc = parse_conf_ugrid_coordinates_file(&conf); @@ -524,7 +524,7 @@ void PointStatConfInfo::process_geog(const Grid &grid, sfc_info.land_ptr = &land_mask; } else { - sfc_info.land_ptr = 0; + sfc_info.land_ptr = nullptr; } if(vx_opt[i].topo_flag) { sfc_info.topo_ptr = &topo_dp; @@ -532,7 +532,7 @@ void PointStatConfInfo::process_geog(const Grid &grid, sfc_info.topo_interp_fcst_thresh = topo_interp_fcst_thresh; } else { - sfc_info.topo_ptr = 0; + sfc_info.topo_ptr = nullptr; } vx_opt[i].vx_pd.set_sfc_info(sfc_info); } @@ -551,119 +551,118 @@ void PointStatConfInfo::set_vx_pd() { //////////////////////////////////////////////////////////////////////// int PointStatConfInfo::n_txt_row(int i_txt_row) const { - int i, n; + int n; // Loop over the tasks and sum the line counts for this line type - for(i=0, n=0; ioutput_map; Dictionary *dict; @@ -880,7 +879,7 @@ void PointStatVxOpt::process_config(GrdFileType ftype, output_map = parse_conf_output_flag(&odict, txt_file_type, n_txt); // Populate the output_flag array with map values - for(i=0; iis_prob(); bool vect_flag = vx_pd.fcst_info->is_v_wind() && @@ -1414,55 +1413,55 @@ int PointStatVxOpt::n_txt_row(int i_txt_row) const { << "\n\n"; exit(1); } - return(n); + return n; } //////////////////////////////////////////////////////////////////////// int PointStatVxOpt::get_n_cnt_thresh() const { - return((!vx_pd.fcst_info || vx_pd.fcst_info->is_prob()) ? - 0 : fcnt_ta.n()); + return (!vx_pd.fcst_info || vx_pd.fcst_info->is_prob()) ? + 0 : fcnt_ta.n(); } //////////////////////////////////////////////////////////////////////// int PointStatVxOpt::get_n_cat_thresh() const { - return((!vx_pd.fcst_info || vx_pd.fcst_info->is_prob()) ? - 0 : fcat_ta.n()); + return (!vx_pd.fcst_info || vx_pd.fcst_info->is_prob()) ? + 0 : fcat_ta.n(); } //////////////////////////////////////////////////////////////////////// int PointStatVxOpt::get_n_wind_thresh() const { - return((!vx_pd.fcst_info || vx_pd.fcst_info->is_prob()) ? - 0 : fwind_ta.n()); + return (!vx_pd.fcst_info || vx_pd.fcst_info->is_prob()) ? + 0 : fwind_ta.n(); } //////////////////////////////////////////////////////////////////////// int PointStatVxOpt::get_n_fprob_thresh() const { - return((!vx_pd.fcst_info || !vx_pd.fcst_info->is_prob()) ? - 0 : fcat_ta.n()); + return (!vx_pd.fcst_info || !vx_pd.fcst_info->is_prob()) ? + 0 : fcat_ta.n(); } //////////////////////////////////////////////////////////////////////// int PointStatVxOpt::get_n_oprob_thresh() const { - return((!vx_pd.fcst_info || !vx_pd.fcst_info->is_prob()) ? - 0 : ocat_ta.n()); + return (!vx_pd.fcst_info || !vx_pd.fcst_info->is_prob()) ? + 0 : ocat_ta.n(); } //////////////////////////////////////////////////////////////////////// int PointStatVxOpt::get_n_hira_ens() const { int n = (hira_info.flag ? hira_info.width.max() : 0); - return(n*n); + return n*n; } //////////////////////////////////////////////////////////////////////// int PointStatVxOpt::get_n_hira_prob() const { - return(hira_info.flag ? hira_info.cov_ta.n() : 0); + return hira_info.flag ? hira_info.cov_ta.n() : 0; } //////////////////////////////////////////////////////////////////////// From d39dcf1c486fbd69a1b9b06c923c99dfab710471 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 7 Nov 2023 14:52:03 -0700 Subject: [PATCH 062/109] #2231 Check if ugrid_dataset is missing --- src/libcode/vx_data2d_ugrid/ugrid_file.cc | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.cc b/src/libcode/vx_data2d_ugrid/ugrid_file.cc index fc45971372..4e4a3e1f6b 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.cc +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.cc @@ -944,21 +944,28 @@ void UGridFile::set_dataset(ConcatString _dataset_name, bool do_override) { const char *ugrid_config_name = nullptr; + if (0 == _dataset_name.length()) { + mlog << Error << "\nUGridFile::set_dataset()" + << " The \"" << conf_key_ugrid_dataset + << "\" is not defined at the configuration file.\n\n"; + exit(1); + } dataset_name = _dataset_name; ConcatString dataset_config(def_config_prefix); dataset_config.add(dataset_name); - ugrid_config_name = replace_path(dataset_config.c_str()).c_str(); - if (!file_exists(ugrid_config_name)) { + if (!file_exists(dataset_config.c_str())) { dataset_config = def_config_prefix2; dataset_config.add(dataset_name); - ugrid_config_name = replace_path(dataset_config.c_str()).c_str(); + dataset_config = replace_path(dataset_config.c_str()); } + ugrid_config_name = dataset_config.c_str(); if (file_exists(ugrid_config_name)) { read_config(ugrid_config_name, do_override); } else { mlog << Error << "\nUGridFile::set_dataset()" - << " The UGrid dataset \"" << dataset_name << "\" is not supported.\n\n"; + << " The UGrid dataset \"" << dataset_name << "\" is not supported. Please add \"" + << ugrid_config_name << "\".\n\n"; exit(1); } From afba3a1824b99b9add4012c6e996d3c63301a659 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 7 Nov 2023 14:52:41 -0700 Subject: [PATCH 063/109] #2231 Initial release --- data/config/UGridConfig_lfric | 37 +++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 data/config/UGridConfig_lfric diff --git a/data/config/UGridConfig_lfric b/data/config/UGridConfig_lfric new file mode 100644 index 0000000000..b2f53e1eec --- /dev/null +++ b/data/config/UGridConfig_lfric @@ -0,0 +1,37 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Unstructured Grid configuration file. +// +// UGridConfig_user at the current working directory overrides the default. +// For additional or updated information, please see the MET User's Guide. +// +//////////////////////////////////////////////////////////////////////////////// + +// +// Default mapping for Metadata. +// The first values are for MPAS and the second values are for LFric. +// +ugrid_metadata_map = [ + { key = "dim_face"; val = "nMesh2d_face"; }, + { key = "dim_node"; val = "nMesh2d_node"; }, + { key = "dim_edge"; val = "nMesh2d_edge"; }, + { key = "dim_time"; val = "time_counter"; }, + { key = "dim_vert"; val = "nVertLevels"; }, + { key = "cell_id"; val = "indexToCellID"; }, + { key = "lat_face"; val = "Mesh2d_face_y"; }, + { key = "lon_face"; val = "Mesh2d_face_x"; }, + { key = "vert_face"; val = "zCell"; }, + { key = "lat_edge"; val = "Mesh2d_edge_y"; }, + { key = "lon_edge"; val = "Mesh2d_edge_x"; }, + { key = "lat_node"; val = "Mesh2d_node_y"; }, + { key = "lon_node"; val = "Mesh2d_node_x"; }, + { key = "time"; val = "time_centered"; } +]; + +ugrid_max_distance_km = 30; + +//////////////////////////////////////////////////////////////////////////////// + +version = "V12.0.0"; + +//////////////////////////////////////////////////////////////////////////////// From 8a9e05da584883777f9b56660b5b0474036cab1e Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 7 Nov 2023 14:53:41 -0700 Subject: [PATCH 064/109] #2231 Added ugrid_dataset = mpas --- internal/test_unit/config/GridStatConfig_ugrid_mpas | 13 +++++-------- .../test_unit/config/GridStatConfig_ugrid_mpas_diag | 13 +++++-------- .../config/PointStatConfig_ugrid_mpas_diag | 13 +++++-------- .../test_unit/config/PointStatConfig_ugrid_mpas_out | 13 +++++-------- 4 files changed, 20 insertions(+), 32 deletions(-) diff --git a/internal/test_unit/config/GridStatConfig_ugrid_mpas b/internal/test_unit/config/GridStatConfig_ugrid_mpas index d811ad56da..159f2ec142 100644 --- a/internal/test_unit/config/GridStatConfig_ugrid_mpas +++ b/internal/test_unit/config/GridStatConfig_ugrid_mpas @@ -246,14 +246,11 @@ nc_pairs_flag = { seeps_p1_thresh = NA; //////////////////////////////////////////////////////////////////////////////// -// Unstructured Grid (optional) -// - ugrid_max_distance_km: The closest neighbor should be less or equal to ugrid_max_distance_km. -// Accept all if ugrid_max_distance_km is equal or less than 0. -// - ugrid_user_map_config: the user defined configuration file for ugrid_metadata_map -// - ugrid_coordinates_file: NetCDF file name which contains coordinate variables for unstructured grid. - -ugrid_max_distance_km = 30; -//ugrid_user_map_config = ""; +// Unstructured Grid (optional ecept ugrid_dataset) + +ugrid_dataset = "mpas"; +//ugrid_max_distance_km = 30; +//ugrid_map_config = ""; ugrid_coordinates_file = "${MET_TEST_INPUT}/ugrid_data/mpas/static.40962_reduced.nc"; //////////////////////////////////////////////////////////////////////////////// diff --git a/internal/test_unit/config/GridStatConfig_ugrid_mpas_diag b/internal/test_unit/config/GridStatConfig_ugrid_mpas_diag index e9b8a3629a..f58bc9c288 100644 --- a/internal/test_unit/config/GridStatConfig_ugrid_mpas_diag +++ b/internal/test_unit/config/GridStatConfig_ugrid_mpas_diag @@ -247,14 +247,11 @@ nc_pairs_flag = { seeps_p1_thresh = NA; //////////////////////////////////////////////////////////////////////////////// -// Unstructured Grid (optional) -// - ugrid_max_distance_km: The closest neighbor should be less or equal to ugrid_max_distance_km. -// Accept all if ugrid_max_distance_km is equal or less than 0. -// - ugrid_user_map_config: the user defined configuration file for ugrid_metadata_map -// - ugrid_coordinates_file: NetCDF file name which contains coordinate variables for unstructured grid. - -ugrid_max_distance_km = 30; -//ugrid_user_map_config = ""; +// Unstructured Grid (optional ecept ugrid_dataset) + +ugrid_dataset = "mpas"; +//ugrid_max_distance_km = 30; +//ugrid_map_config = ""; ugrid_coordinates_file = "${MET_TEST_INPUT}/ugrid_data/mpas/static.40962_reduced.nc"; diff --git a/internal/test_unit/config/PointStatConfig_ugrid_mpas_diag b/internal/test_unit/config/PointStatConfig_ugrid_mpas_diag index 2ce12c97d2..6f03df7ec4 100644 --- a/internal/test_unit/config/PointStatConfig_ugrid_mpas_diag +++ b/internal/test_unit/config/PointStatConfig_ugrid_mpas_diag @@ -150,14 +150,11 @@ output_flag = { seeps_p1_thresh = NA; //////////////////////////////////////////////////////////////////////////////// -// Unstructured Grid (optional) -// - ugrid_max_distance_km: The closest neighbor should be less or equal to ugrid_max_distance_km. -// Accept all if ugrid_max_distance_km is equal or less than 0. -// - ugrid_user_map_config: the user defined configuration file for ugrid_metadata_map -// - ugrid_coordinates_file: NetCDF file name which contains coordinate variables for unstructured grid. - -ugrid_max_distance_km = 30; -//ugrid_user_map_config = ""; +// Unstructured Grid (optional ecept ugrid_dataset) + +ugrid_dataset = "mpas"; +//ugrid_max_distance_km = 30; +//ugrid_map_config = ""; ugrid_coordinates_file = "${MET_TEST_INPUT}/ugrid_data/mpas/static.40962_reduced.nc"; //////////////////////////////////////////////////////////////////////////////// diff --git a/internal/test_unit/config/PointStatConfig_ugrid_mpas_out b/internal/test_unit/config/PointStatConfig_ugrid_mpas_out index 95ebb7b0df..98c7a1e71f 100644 --- a/internal/test_unit/config/PointStatConfig_ugrid_mpas_out +++ b/internal/test_unit/config/PointStatConfig_ugrid_mpas_out @@ -151,14 +151,11 @@ output_flag = { seeps_p1_thresh = NA; //////////////////////////////////////////////////////////////////////////////// -// Unstructured Grid (optional) -// - ugrid_max_distance_km: The closest neighbor should be less or equal to ugrid_max_distance_km. -// Accept all if ugrid_max_distance_km is equal or less than 0. -// - ugrid_user_map_config: the user defined configuration file for ugrid_metadata_map -// - ugrid_coordinates_file: NetCDF file name which contains coordinate variables for unstructured grid. - -ugrid_max_distance_km = 30; -//ugrid_user_map_config = ""; +// Unstructured Grid (optional ecept ugrid_dataset) + +ugrid_dataset = "mpas"; +//ugrid_max_distance_km = 30; +//ugrid_map_config = ""; ugrid_coordinates_file = "${MET_TEST_INPUT}/ugrid_data/mpas/static.40962_reduced.nc"; //////////////////////////////////////////////////////////////////////////////// From ba85639b7e6c6ce0841fd9dccc6f533a2abe6a30 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 7 Nov 2023 14:54:21 -0700 Subject: [PATCH 065/109] #2231 Added ugrid_max_distance_km --- data/config/UGridConfig_mpas | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/config/UGridConfig_mpas b/data/config/UGridConfig_mpas index 27f5133570..0a9916a153 100644 --- a/data/config/UGridConfig_mpas +++ b/data/config/UGridConfig_mpas @@ -28,6 +28,8 @@ ugrid_metadata_map = [ { key = "time"; val = "xtime,time_centered"; } ]; +ugrid_max_distance_km = 30; + //////////////////////////////////////////////////////////////////////////////// version = "V12.0.0"; From 65190bf79c13e7c88e30a6f4f3bb4e33af098c5b Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 7 Nov 2023 14:55:16 -0700 Subject: [PATCH 066/109] #2231 Removed UGridConfig_default and added UGridConfig_lfric and UGridConfig_mpas --- data/config/Makefile.am | 3 ++- data/config/Makefile.in | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/data/config/Makefile.am b/data/config/Makefile.am index 8b2490fbb2..f6ed69c168 100644 --- a/data/config/Makefile.am +++ b/data/config/Makefile.am @@ -48,7 +48,8 @@ config_DATA = \ WWMCARegridConfig_default \ PlotModeFieldConfig_default \ Point2GridConfig_default \ - UGridConfig_default \ + UGridConfig_lfric \ + UGridConfig_mpas \ PlotPointObsConfig_default EXTRA_DIST = ${config_DATA} diff --git a/data/config/Makefile.in b/data/config/Makefile.in index f721b10efd..06694bf28b 100644 --- a/data/config/Makefile.in +++ b/data/config/Makefile.in @@ -335,7 +335,8 @@ config_DATA = \ WWMCARegridConfig_default \ PlotModeFieldConfig_default \ Point2GridConfig_default \ - UGridConfig_default \ + UGridConfig_lfric \ + UGridConfig_mpas \ PlotPointObsConfig_default EXTRA_DIST = ${config_DATA} From 4b085290ec6e6b67dcb2aea3d8d2b8d761b5826d Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 7 Nov 2023 22:05:01 -0700 Subject: [PATCH 067/109] Cleanup --- .../core/grid_stat/grid_stat_conf_info.cc | 34 ++++++++-------- .../core/point_stat/point_stat_conf_info.cc | 40 +++++++++---------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/tools/core/grid_stat/grid_stat_conf_info.cc b/src/tools/core/grid_stat/grid_stat_conf_info.cc index 95bfaab1f4..9f39e590f5 100644 --- a/src/tools/core/grid_stat/grid_stat_conf_info.cc +++ b/src/tools/core/grid_stat/grid_stat_conf_info.cc @@ -434,10 +434,10 @@ void GridStatConfInfo::process_masks(const Grid &grid) { //////////////////////////////////////////////////////////////////////// int GridStatConfInfo::n_txt_row(int i_txt_row) const { - int n; + int n = 0; // Loop over the tasks and sum the line counts for this line type - for(int i=0, n=0; i Date: Wed, 8 Nov 2023 17:25:16 -0700 Subject: [PATCH 068/109] #2231 cleanup --- data/config/UGridConfig_lfric | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/data/config/UGridConfig_lfric b/data/config/UGridConfig_lfric index b2f53e1eec..7c5e164643 100644 --- a/data/config/UGridConfig_lfric +++ b/data/config/UGridConfig_lfric @@ -1,15 +1,14 @@ //////////////////////////////////////////////////////////////////////////////// // -// Unstructured Grid configuration file. +// Unstructured grid configuration file. // -// UGridConfig_user at the current working directory overrides the default. +// UGridConfig_lfric at the current working directory overrides the settings here. // For additional or updated information, please see the MET User's Guide. // //////////////////////////////////////////////////////////////////////////////// // -// Default mapping for Metadata. -// The first values are for MPAS and the second values are for LFric. +// Dimensions and variables mapping for LFric dataset // ugrid_metadata_map = [ { key = "dim_face"; val = "nMesh2d_face"; }, From abebd9b235a22e0837f5f3ce7ed23bd29db4305f Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Wed, 8 Nov 2023 17:25:16 -0700 Subject: [PATCH 069/109] #2231 Removed settings for LFric --- data/config/UGridConfig_mpas | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/data/config/UGridConfig_mpas b/data/config/UGridConfig_mpas index 0a9916a153..a9346bd7df 100644 --- a/data/config/UGridConfig_mpas +++ b/data/config/UGridConfig_mpas @@ -1,31 +1,30 @@ //////////////////////////////////////////////////////////////////////////////// // -// Unstructured Grid configuration file. +// Unstructured grid configuration file. // -// UGridConfig_user at the current working directory overrides the default. +// UGridConfig_mpas at the current working directory overrides the settings here. // For additional or updated information, please see the MET User's Guide. // //////////////////////////////////////////////////////////////////////////////// // -// Default mapping for Metadata. -// The first values are for MPAS and the second values are for LFric. +// Dimensions and variables mapping for MPAS dataset // ugrid_metadata_map = [ - { key = "dim_face"; val = "nCells,nMesh2d_face"; }, - { key = "dim_node"; val = "nVertices,nMesh2d_node"; }, - { key = "dim_edge"; val = "nEdges,nMesh2d_edge"; }, - { key = "dim_time"; val = "Time,time_counter"; }, + { key = "dim_face"; val = "nCells; }, + { key = "dim_node"; val = "nVertices"; }, + { key = "dim_edge"; val = "nEdges"; }, + { key = "dim_time"; val = "Time"; }, { key = "dim_vert"; val = "nVertLevels"; }, - { key = "cell_id"; val = "indexToCellID,"; }, - { key = "lat_face"; val = "latCell,Mesh2d_face_y"; }, - { key = "lon_face"; val = "lonCell,Mesh2d_face_x"; }, + { key = "cell_id"; val = "indexToCellID"; }, + { key = "lat_face"; val = "latCell"; }, + { key = "lon_face"; val = "lonCell"; }, { key = "vert_face"; val = "zCell"; }, - { key = "lat_edge"; val = "latEdge,Mesh2d_edge_y"; }, - { key = "lon_edge"; val = "lonEdge,Mesh2d_edge_x"; }, - { key = "lat_node"; val = "latVertex,Mesh2d_node_y"; }, - { key = "lon_node"; val = "lonVertex,Mesh2d_node_x"; }, - { key = "time"; val = "xtime,time_centered"; } + { key = "lat_edge"; val = "latEdge"; }, + { key = "lon_edge"; val = "lonEdge"; }, + { key = "lat_node"; val = "latVertex"; }, + { key = "lon_node"; val = "lonVertex"; }, + { key = "time"; val = "xtime"; } ]; ugrid_max_distance_km = 30; From 18a44d9e9d1fb6095318cea067d5c6041f487a53 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Thu, 9 Nov 2023 02:56:25 -0700 Subject: [PATCH 070/109] #2231 Corercted delete statement for tmp_buf --- src/libcode/vx_nc_util/nc_utils.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcode/vx_nc_util/nc_utils.cc b/src/libcode/vx_nc_util/nc_utils.cc index 8a937e2425..a2c8312487 100644 --- a/src/libcode/vx_nc_util/nc_utils.cc +++ b/src/libcode/vx_nc_util/nc_utils.cc @@ -1240,7 +1240,7 @@ double get_nc_time(NcVar * var, const int index) { << GET_NC_NAME_P(var) << "\".\n\n"; exit(1); } - if (tmp_buf) delete tmp_buf; + if (tmp_buf) delete tmp_buf[]; } return(k); From 9e60a394809a362f6f3f25d46542c051e446d5c5 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Thu, 9 Nov 2023 02:57:14 -0700 Subject: [PATCH 071/109] #2231 Initialize ut --- src/libcode/vx_data2d_ugrid/ugrid_file.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.cc b/src/libcode/vx_data2d_ugrid/ugrid_file.cc index 4e4a3e1f6b..bb8d2ca812 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.cc +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.cc @@ -194,7 +194,7 @@ bool UGridFile::open(const char * filepath) bool UGridFile::open_metadata(const char * filepath) { - unixtime ut; + unixtime ut = 0; int sec_per_unit; const char *method_name = "UGridFile::open_metadata() -> "; From 2561ae193ea62113e3ccc05b6678358f6dea0272 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Thu, 9 Nov 2023 02:58:44 -0700 Subject: [PATCH 072/109] #2231 Added ugrid_compile_error --- src/basic/vx_config/config_util.cc | 13 +++++++++++++ src/basic/vx_config/config_util.h | 1 + 2 files changed, 14 insertions(+) diff --git a/src/basic/vx_config/config_util.cc b/src/basic/vx_config/config_util.cc index 4d2240afb5..a3ccd67794 100644 --- a/src/basic/vx_config/config_util.cc +++ b/src/basic/vx_config/config_util.cc @@ -3334,3 +3334,16 @@ void python_compile_error(const char *caller) { } /////////////////////////////////////////////////////////////////////////////// + +void ugrid_compile_error(const char *caller) { + + const char *method_name = (nullptr != caller) ? caller : "ugrid_compile_error() -> "; + + mlog << Error << "\n" << method_name + << "Support for the unstructured grid has not been compiled!\n" + << "To use the filetype NETCDF_UGRID (unstructured grid), recompile with the --enable-ugrid option.\n\n"; + + exit(1); +} + +/////////////////////////////////////////////////////////////////////////////// diff --git a/src/basic/vx_config/config_util.h b/src/basic/vx_config/config_util.h index 20d6381aa2..2e0d36a30a 100644 --- a/src/basic/vx_config/config_util.h +++ b/src/basic/vx_config/config_util.h @@ -145,6 +145,7 @@ extern ConcatString wavelettype_to_string(WaveletType); extern int parse_conf_percentile(Dictionary *dict); extern void python_compile_error(const char *caller=nullptr); +extern void ugrid_compile_error(const char *caller=nullptr); //////////////////////////////////////////////////////////////////////// From ab756f556a6280d2bc6e907ee544b2a0045da8ff Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Thu, 9 Nov 2023 03:00:40 -0700 Subject: [PATCH 073/109] #2231 Replaced the error message by calling ugrid_compile_error --- .../vx_data2d_factory/data2d_factory.cc | 8 +-- .../vx_data2d_factory/var_info_factory.cc | 10 ++-- src/tools/core/grid_stat/grid_stat.cc | 55 ++++++++++--------- src/tools/core/point_stat/point_stat.cc | 6 +- 4 files changed, 40 insertions(+), 39 deletions(-) diff --git a/src/libcode/vx_data2d_factory/data2d_factory.cc b/src/libcode/vx_data2d_factory/data2d_factory.cc index 36b0b041d3..729b43417e 100644 --- a/src/libcode/vx_data2d_factory/data2d_factory.cc +++ b/src/libcode/vx_data2d_factory/data2d_factory.cc @@ -130,14 +130,10 @@ MetPythonDataFile * p = nullptr; #ifdef WITH_UGRID // For FileType_None, silently return a nullptr pointer mtddf = new MetUGridDataFile; - break; #else - mlog << Error << "\n" << method_name - << "data file type \"" << grdfiletype_to_string(type) - << "\" is not activated. Recompile with the --enable-ugrid option" - << "\"\n\n"; - exit(1); + ugrid_compile_error(method_name); #endif + break; case FileType_None: // For FileType_None, silently return a nullptr pointer diff --git a/src/libcode/vx_data2d_factory/var_info_factory.cc b/src/libcode/vx_data2d_factory/var_info_factory.cc index 92580f5fce..3ac92b1dd1 100644 --- a/src/libcode/vx_data2d_factory/var_info_factory.cc +++ b/src/libcode/vx_data2d_factory/var_info_factory.cc @@ -52,11 +52,11 @@ VarInfo * VarInfoFactory::new_var_info(GrdFileType type) { - VarInfo *vi = (VarInfo *) 0; + VarInfo *vi = (VarInfo *) nullptr; const char *method_name = "VarInfoFactory::new_var_info() -> "; #ifdef WITH_PYTHON - VarInfoPython * p = 0; + VarInfoPython * p = nullptr; #endif // @@ -95,7 +95,7 @@ VarInfo * VarInfoFactory::new_var_info(GrdFileType type) p = new VarInfoPython; p->set_file_type(type); vi = p; - p = 0; + p = nullptr; break; #else python_compile_error(method_name); @@ -105,10 +105,12 @@ VarInfo * VarInfoFactory::new_var_info(GrdFileType type) vi = new VarInfoNcCF; break; -#ifdef WITH_UGRID case FileType_UGrid: +#ifdef WITH_UGRID vi = new VarInfoUGrid; break; +#else + ugrid_compile_error(method_name); #endif case FileType_HdfEos: diff --git a/src/tools/core/grid_stat/grid_stat.cc b/src/tools/core/grid_stat/grid_stat.cc index 50f253c2cd..5a45ecae0b 100644 --- a/src/tools/core/grid_stat/grid_stat.cc +++ b/src/tools/core/grid_stat/grid_stat.cc @@ -297,38 +297,39 @@ void process_command_line(int argc, char **argv) { // Process the configuration conf_info.process_config(ftype, otype); + if (FileType_UGrid == ftype || FileType_UGrid == otype) { #ifdef WITH_UGRID - if (FileType_UGrid == ftype) { ConcatString ugrid_nc = conf_info.ugrid_nc; ConcatString ugrid_dataset = conf_info.ugrid_dataset; ConcatString ugrid_map_config = conf_info.ugrid_map_config; - MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)fcst_mtddf; - ugrid_mtddf->set_max_distance_km(conf_info.ugrid_max_distance_km); - if (0 < ugrid_dataset.length()) ugrid_mtddf->set_dataset(ugrid_dataset); - if (0 < ugrid_map_config.length()) - ugrid_mtddf->set_map_config_file(ugrid_map_config); - if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; - ugrid_mtddf->open_metadata(ugrid_nc.c_str()); - mlog << Debug(9) << method_name - << "FCST: ugrid_coordinates_nc: " << ugrid_nc - << " ugrid_max_distance_km: " << conf_info.ugrid_max_distance_km << "\n"; - } - if (FileType_UGrid == otype) { - ConcatString ugrid_nc = conf_info.ugrid_nc; - ConcatString ugrid_dataset = conf_info.ugrid_dataset; - ConcatString ugrid_map_config = conf_info.ugrid_map_config; - MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)obs_mtddf; - ugrid_mtddf->set_max_distance_km(conf_info.ugrid_max_distance_km); - if (0 < ugrid_dataset.length()) ugrid_mtddf->set_dataset(ugrid_dataset); - if (0 < ugrid_map_config.length()) - ugrid_mtddf->set_map_config_file(ugrid_map_config); - if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; - ugrid_mtddf->open_metadata(ugrid_nc.c_str()); - mlog << Debug(9) << method_name - << "OBS: ugrid_coordinates_nc: " << ugrid_nc - << " ugrid_max_distance_km: " << conf_info.ugrid_max_distance_km << "\n"; - } + if (FileType_UGrid == ftype) { + MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)fcst_mtddf; + ugrid_mtddf->set_max_distance_km(conf_info.ugrid_max_distance_km); + if (0 < ugrid_dataset.length()) ugrid_mtddf->set_dataset(ugrid_dataset); + if (0 < ugrid_map_config.length()) + ugrid_mtddf->set_map_config_file(ugrid_map_config); + if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; + ugrid_mtddf->open_metadata(ugrid_nc.c_str()); + mlog << Debug(9) << method_name + << "FCST: ugrid_coordinates_nc: " << ugrid_nc + << " ugrid_max_distance_km: " << conf_info.ugrid_max_distance_km << "\n"; + } + if (FileType_UGrid == otype) { + MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)obs_mtddf; + ugrid_mtddf->set_max_distance_km(conf_info.ugrid_max_distance_km); + if (0 < ugrid_dataset.length()) ugrid_mtddf->set_dataset(ugrid_dataset); + if (0 < ugrid_map_config.length()) + ugrid_mtddf->set_map_config_file(ugrid_map_config); + if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; + ugrid_mtddf->open_metadata(ugrid_nc.c_str()); + mlog << Debug(9) << method_name + << "OBS: ugrid_coordinates_nc: " << ugrid_nc + << " ugrid_max_distance_km: " << conf_info.ugrid_max_distance_km << "\n"; + } +#else + ugrid_compile_error(method_name); #endif + } // For python types read the first field to set the grid if(is_python_grdfiletype(ftype)) { diff --git a/src/tools/core/point_stat/point_stat.cc b/src/tools/core/point_stat/point_stat.cc index 9cb7ce9c4a..8902cf62eb 100644 --- a/src/tools/core/point_stat/point_stat.cc +++ b/src/tools/core/point_stat/point_stat.cc @@ -304,8 +304,8 @@ void process_command_line(int argc, char **argv) { // Set the model name shc.set_model(conf_info.model.c_str()); -#ifdef WITH_UGRID if (FileType_UGrid == ftype) { +#ifdef WITH_UGRID ConcatString ugrid_nc = conf_info.ugrid_nc; ConcatString ugrid_dataset = conf_info.ugrid_dataset; ConcatString ugrid_map_config = conf_info.ugrid_map_config; @@ -319,8 +319,10 @@ void process_command_line(int argc, char **argv) { mlog << Debug(9) << method_name << "ugrid_coordinate_nc: " << ugrid_nc << " ugrid_max_distance_km: " << conf_info.ugrid_max_distance_km << "\n"; - } +#else + ugrid_compile_error(method_name); #endif + } // Use the first verification task to set the random number generator // and seed value for bootstrap confidence intervals From ae8672792838858ca88e361816bacf8b3e778346 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Thu, 9 Nov 2023 23:15:33 -0700 Subject: [PATCH 074/109] #2231 Added a missing double quation mark --- data/config/UGridConfig_mpas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/config/UGridConfig_mpas b/data/config/UGridConfig_mpas index a9346bd7df..803daf6767 100644 --- a/data/config/UGridConfig_mpas +++ b/data/config/UGridConfig_mpas @@ -11,7 +11,7 @@ // Dimensions and variables mapping for MPAS dataset // ugrid_metadata_map = [ - { key = "dim_face"; val = "nCells; }, + { key = "dim_face"; val = "nCells"; }, { key = "dim_node"; val = "nVertices"; }, { key = "dim_edge"; val = "nEdges"; }, { key = "dim_time"; val = "Time"; }, From 11070b61eb832e8c439f1ba827505d7c5debf643 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Thu, 9 Nov 2023 23:17:16 -0700 Subject: [PATCH 075/109] #2231 Corrected bad syntax to release a memory --- src/libcode/vx_nc_util/nc_utils.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcode/vx_nc_util/nc_utils.cc b/src/libcode/vx_nc_util/nc_utils.cc index a2c8312487..ca707c7268 100644 --- a/src/libcode/vx_nc_util/nc_utils.cc +++ b/src/libcode/vx_nc_util/nc_utils.cc @@ -1240,7 +1240,7 @@ double get_nc_time(NcVar * var, const int index) { << GET_NC_NAME_P(var) << "\".\n\n"; exit(1); } - if (tmp_buf) delete tmp_buf[]; + if (tmp_buf) delete [] tmp_buf; } return(k); From 51b4f6cad8f2bfadbb5b4909c2d8ff7a184e746e Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Thu, 9 Nov 2023 23:18:37 -0700 Subject: [PATCH 076/109] #2231 Added parse_add_conf_key_values_map and parse_add_conf_ugrid_metadata_map --- src/basic/vx_config/config_util.cc | 41 ++++++++++++++++++++++++------ src/basic/vx_config/config_util.h | 5 +++- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/src/basic/vx_config/config_util.cc b/src/basic/vx_config/config_util.cc index a3ccd67794..78bff4dadc 100644 --- a/src/basic/vx_config/config_util.cc +++ b/src/basic/vx_config/config_util.cc @@ -1010,20 +1010,19 @@ TimeSummaryInfo parse_conf_time_summary(Dictionary *dict) { } /////////////////////////////////////////////////////////////////////////////// +// Conf: map_name: message_type_map, obs_var_map, etc void parse_add_conf_key_value_map( Dictionary *dict, const char *conf_key_map_name, map *m) { - Dictionary *map_dict = (Dictionary *) nullptr; - ConcatString key, val; if(!dict) { - mlog << Error << "\nparse_conf_key_value_type_map() -> " + mlog << Error << "\nparse_add_conf_key_value_map() -> " << "empty dictionary!\n\n"; exit(1); } - // Conf: map_name: message_type_map, obs)var_map, etc - map_dict = dict->lookup_array(conf_key_map_name); + ConcatString key, val; + Dictionary *map_dict = dict->lookup_array(conf_key_map_name); // Loop through the array entries for(int i=0; in_entries(); i++) { @@ -1044,6 +1043,32 @@ void parse_add_conf_key_value_map( return; } +/////////////////////////////////////////////////////////////////////////////// +// Conf: map_name: ugrid_metadata_maps + +void parse_add_conf_key_values_map( + Dictionary *dict, const char *conf_key_map_name, + map *sa_map, const char *caller) { + const char *method_name = (nullptr != caller) ? caller : "parse_conf_key_values_map() -> "; + + if(!dict) { + mlog << Error << "\n" << method_name + << "empty dictionary!\n\n"; + exit(1); + } + + StringArray sa; + map cs_map = parse_conf_key_value_map(dict, conf_key_map_name, method_name); + + // Loop through the array entries and convert input comma-separated strings to StringArray + for(map::const_iterator it=cs_map.begin(); it!= cs_map.end(); it++) { + sa.parse_css(it->second); + (*sa_map)[it->first] = sa; + } + + return; +} + /////////////////////////////////////////////////////////////////////////////// map parse_conf_key_value_map( @@ -2288,9 +2313,9 @@ ConcatString parse_conf_ugrid_map_config(Dictionary *dict) { /////////////////////////////////////////////////////////////////////////////// -map parse_conf_ugrid_metadata_map(Dictionary *dict) { - const char *method_name = "parse_conf_ugrid_metadata_map() -> "; - return parse_conf_key_values_map(dict, conf_key_ugrid_metadata_map, method_name); +void parse_add_conf_ugrid_metadata_map(Dictionary *dict, map *m) { + parse_add_conf_key_values_map(dict, conf_key_ugrid_metadata_map, m, + "parse_add_conf_ugrid_metadata_map"); } diff --git a/src/basic/vx_config/config_util.h b/src/basic/vx_config/config_util.h index 2e0d36a30a..47bee9e65e 100644 --- a/src/basic/vx_config/config_util.h +++ b/src/basic/vx_config/config_util.h @@ -55,6 +55,9 @@ extern std::map parse_conf_key_value_map( Dictionary *dict, const char *conf_key_map_name, const char *caller=nullptr); extern void parse_add_conf_key_value_map( Dictionary *dict, const char *conf_key_map_name, std::map *m); +extern void parse_add_conf_key_values_map( + Dictionary *dict, const char *conf_key_map_name, + std::map *m, const char *caller=nullptr); extern std::map parse_conf_message_type_map(Dictionary *dict); extern std::map @@ -89,7 +92,7 @@ extern ConcatString parse_conf_ugrid_coordinates_file(Dictionary *dict); extern ConcatString parse_conf_ugrid_dataset(Dictionary *dict); extern ConcatString parse_conf_ugrid_map_config(Dictionary *dict); extern double parse_conf_ugrid_max_distance_km(Dictionary *dict); -extern std::map parse_conf_ugrid_metadata_map(Dictionary *dict); +extern void parse_add_conf_ugrid_metadata_map(Dictionary *dict, std::map *m); extern void check_mask_names(const StringArray &); From 467d9d9cacd226b052bd6553d7b020c96a678729 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Thu, 9 Nov 2023 23:22:09 -0700 Subject: [PATCH 077/109] #2231 Combined three APIs to set_ugrid_configs --- src/libcode/vx_data2d_ugrid/data2d_ugrid.cc | 124 ++++++++++---------- src/libcode/vx_data2d_ugrid/data2d_ugrid.h | 11 +- 2 files changed, 66 insertions(+), 69 deletions(-) diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc index fa1c5831f1..d9e0fde151 100644 --- a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc @@ -942,95 +942,91 @@ int MetUGridDataFile::index(VarInfo &vinfo){ bool MetUGridDataFile::read_data_plane(ConcatString var_name, VarInfo &vinfo, DataPlane &plane, LongArray &dimension) { - static const string method_name + static const string method_name = "MetUGridDataFile::read_data_plane() -> "; - // Read the data - NcVarInfo *info = (NcVarInfo *) nullptr; + // Read the data + NcVarInfo *info = (NcVarInfo *) nullptr; - bool status = _file->getData(var_name.c_str(), - dimension, - plane, info); + bool status = _file->getData(var_name.c_str(), + dimension, + plane, info); - //if (org_time_offset != bad_data_int && 0 <= time_dim_slot) - // dimension[time_dim_slot] = org_time_offset; - //if (org_z_offset != bad_data_int && 0 <= zdim_slot) - // dimension[zdim_slot] = org_z_offset; + //if (org_time_offset != bad_data_int && 0 <= time_dim_slot) + // dimension[time_dim_slot] = org_time_offset; + //if (org_z_offset != bad_data_int && 0 <= zdim_slot) + // dimension[zdim_slot] = org_z_offset; - // Check that the times match those requested + // Check that the times match those requested - if (status) - { - // Check that the valid time matches the request + if (status) + { + // Check that the valid time matches the request - if (vinfo.valid() > 0 && vinfo.valid() != plane.valid()) - { - // Compute time strings + if (vinfo.valid() > 0 && vinfo.valid() != plane.valid()) + { + // Compute time strings - ConcatString req_time_str = unix_to_yyyymmdd_hhmmss(vinfo.valid()); - ConcatString data_time_str = unix_to_yyyymmdd_hhmmss(plane.valid()); + ConcatString req_time_str = unix_to_yyyymmdd_hhmmss(vinfo.valid()); + ConcatString data_time_str = unix_to_yyyymmdd_hhmmss(plane.valid()); - mlog << Warning << "\n" << method_name - << "for \"" << vinfo.req_name() << "\" variable, the valid " - << "time does not match the requested valid time: (" - << data_time_str << " != " << req_time_str << ")\n\n"; - status = false; - } + mlog << Warning << "\n" << method_name + << "for \"" << vinfo.req_name() << "\" variable, the valid " + << "time does not match the requested valid time: (" + << data_time_str << " != " << req_time_str << ")\n\n"; + status = false; + } - // Check that the lead time matches the request + // Check that the lead time matches the request - if (vinfo.lead() > 0 && vinfo.lead() != plane.lead()) - { - // Compute time strings + if (vinfo.lead() > 0 && vinfo.lead() != plane.lead()) + { + // Compute time strings - ConcatString req_time_str = sec_to_hhmmss(vinfo.lead()); - ConcatString data_time_str = sec_to_hhmmss(plane.lead()); + ConcatString req_time_str = sec_to_hhmmss(vinfo.lead()); + ConcatString data_time_str = sec_to_hhmmss(plane.lead()); - mlog << Warning << "\n" << method_name - << "for \"" << vinfo.req_name() << "\" variable, the lead " - << "time does not match the requested lead time: (" - << data_time_str << " != " << req_time_str << ")\n\n"; - status = false; - } + mlog << Warning << "\n" << method_name + << "for \"" << vinfo.req_name() << "\" variable, the lead " + << "time does not match the requested lead time: (" + << data_time_str << " != " << req_time_str << ")\n\n"; + status = false; + } - status = process_data_plane(&vinfo, plane); + status = process_data_plane(&vinfo, plane); - // Set the VarInfo object's name, long_name, level, and units strings + // Set the VarInfo object's name, long_name, level, and units strings - if (info->name_att.length() > 0) - vinfo.set_name(info->name_att); - else - vinfo.set_name(info->name); + if (info->name_att.length() > 0) + vinfo.set_name(info->name_att); + else + vinfo.set_name(info->name); - if (info->long_name_att.length() > 0) - vinfo.set_long_name(info->long_name_att.c_str()); + if (info->long_name_att.length() > 0) + vinfo.set_long_name(info->long_name_att.c_str()); - if (info->level_att.length() > 0) - vinfo.set_level_name(info->level_att.c_str()); + if (info->level_att.length() > 0) + vinfo.set_level_name(info->level_att.c_str()); - if (info->units_att.length() > 0) - vinfo.set_units(info->units_att.c_str()); - } + if (info->units_att.length() > 0) + vinfo.set_units(info->units_att.c_str()); + } - return status; + return status; } //////////////////////////////////////////////////////////////////////// -void MetUGridDataFile::set_dataset(ConcatString dataset_name) { +void MetUGridDataFile::set_ugrid_configs(ConcatString dataset_name, + double max_distance_km, + ConcatString map_config_filename) { _file->set_dataset(dataset_name); -} - -//////////////////////////////////////////////////////////////////////// - -void MetUGridDataFile::set_max_distance_km(double max_distance) { - _file->set_max_distance_km(max_distance); -} - -//////////////////////////////////////////////////////////////////////// - -void MetUGridDataFile::set_map_config_file(ConcatString filename) { - _file->set_map_config_file(filename); + if (0 < map_config_filename.length()) { + _file->set_map_config_file(map_config_filename); + } + if (!is_eq(bad_data_double, max_distance_km)) { + _file->set_max_distance_km(max_distance_km); + } } diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.h b/src/libcode/vx_data2d_ugrid/data2d_ugrid.h index 2e4fd74eb5..935ddc73ed 100644 --- a/src/libcode/vx_data2d_ugrid/data2d_ugrid.h +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.h @@ -62,7 +62,7 @@ class MetUGridDataFile : public Met2dDataFile { virtual int nx() const { - if (_file == 0) + if (_file == nullptr) return 0; return _file->getNx(); @@ -109,9 +109,9 @@ class MetUGridDataFile : public Met2dDataFile { bool open (const char * filename); bool open_metadata(const char * filename); - void set_dataset(ConcatString dataset_name); - void set_map_config_file(ConcatString filename); - void set_max_distance_km(double max_distance); + ConcatString coordinate_file() const; + void set_ugrid_configs(ConcatString dataset_name, double max_distance_km, + ConcatString map_config_filename); void close (); @@ -123,7 +123,8 @@ class MetUGridDataFile : public Met2dDataFile { //////////////////////////////////////////////////////////////////////// -inline GrdFileType MetUGridDataFile::file_type () const { return ( FileType_UGrid ); } +inline GrdFileType MetUGridDataFile::file_type () const { return FileType_UGrid; } +inline ConcatString MetUGridDataFile::coordinate_file() const { return _file->coordinate_nc(); } //////////////////////////////////////////////////////////////////////// From 588c1b8bd622f432a68b8667f32957d3e57945f3 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Thu, 9 Nov 2023 23:41:32 -0700 Subject: [PATCH 078/109] #2231 Removed the second argument do_override at read_config and set_dataset. Added coordinate_file. --- src/libcode/vx_data2d_ugrid/ugrid_file.cc | 32 ++++++++++++----------- src/libcode/vx_data2d_ugrid/ugrid_file.h | 12 ++++++--- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.cc b/src/libcode/vx_data2d_ugrid/ugrid_file.cc index bb8d2ca812..0ebaddbe2b 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.cc +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.cc @@ -850,8 +850,10 @@ int UGridFile::lead_time() const //////////////////////////////////////////////////////////////////////// -void UGridFile::read_config(ConcatString config_filename, bool do_override) { +void UGridFile::read_config(ConcatString config_filename) { const char *method_name = "UGridFile::read_config() "; + double conf_value; + ConcatString conf_value_s; MetConfig conf; // Read the default config file @@ -859,21 +861,21 @@ void UGridFile::read_config(ConcatString config_filename, bool do_override) { << "configuration from " << config_filename << " (" << replace_path(config_filename) << ")\n"; conf.read(replace_path(config_filename).c_str()); - if (do_override || bad_data_double == max_distance_km) { - max_distance_km = parse_conf_ugrid_max_distance_km(&conf); - } - if (do_override || 0 == metadata_map.size()) { - metadata_map = parse_conf_ugrid_metadata_map(&conf); - metadata_names.clear(); - for (std::map::iterator it=metadata_map.begin(); - it!=metadata_map.end(); ++it) { - metadata_names.add(it->second); - } + conf_value = parse_conf_ugrid_max_distance_km(&conf); + if (!is_eq(conf_value, bad_data_double)) max_distance_km = conf_value; + conf_value_s = parse_conf_ugrid_coordinates_file(&conf); + if (0 < conf_value_s.length()) coordinate_file = conf_value_s; + parse_add_conf_ugrid_metadata_map(&conf, &metadata_map); - mlog << Debug(6) << method_name - << "map size: " << metadata_map.size() << ", dims_vars_count = " << metadata_names.n() << "\n"; + metadata_names.clear(); + for (std::map::iterator it=metadata_map.begin(); + it!=metadata_map.end(); ++it) { + metadata_names.add(it->second); } + mlog << Debug(6) << method_name + << "map size: " << metadata_map.size() << ", dims_vars_count = " << metadata_names.n() << "\n"; + } //////////////////////////////////////////////////////////////////////// @@ -940,7 +942,7 @@ void UGridFile::read_netcdf_grid() //////////////////////////////////////////////////////////////////////// -void UGridFile::set_dataset(ConcatString _dataset_name, bool do_override) { +void UGridFile::set_dataset(ConcatString _dataset_name) { const char *ugrid_config_name = nullptr; @@ -960,7 +962,7 @@ void UGridFile::set_dataset(ConcatString _dataset_name, bool do_override) { } ugrid_config_name = dataset_config.c_str(); if (file_exists(ugrid_config_name)) { - read_config(ugrid_config_name, do_override); + read_config(ugrid_config_name); } else { mlog << Error << "\nUGridFile::set_dataset()" diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.h b/src/libcode/vx_data2d_ugrid/ugrid_file.h index e04df55447..1890f5ea86 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.h +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.h @@ -46,7 +46,9 @@ class UGridFile { bool open(const char *filename); bool open_metadata(const char *filename); bool get_var_info(); - void set_dataset(ConcatString _dataset_name, bool do_override=false); + + ConcatString coordinate_nc(); + void set_dataset(ConcatString _dataset_name); void set_map_config_file(ConcatString filename); void set_max_distance_km(double max_distance); @@ -118,9 +120,10 @@ class UGridFile { netCDF::NcFile * _ncFile; // allocated netCDF::NcFile * _ncMetaFile; // allocated - std::map metadata_map; - StringArray metadata_names; ConcatString dataset_name; + ConcatString coordinate_file; + StringArray metadata_names; + std::map metadata_map; double max_distance_km; // // dimensions @@ -162,7 +165,7 @@ class UGridFile { std::string find_metadata_name(std::string &key, StringArray &available_names); StringArray get_metadata_names(std::string &key); - void read_config(ConcatString config_filename, bool do_override=true); + void read_config(ConcatString config_filename); void read_netcdf_grid(); }; @@ -171,6 +174,7 @@ class UGridFile { //////////////////////////////////////////////////////////////////////// inline netCDF::NcDim *UGridFile::get_vert_dim() const { return _virtDim; } +inline ConcatString UGridFile::coordinate_nc() { return coordinate_file; } //////////////////////////////////////////////////////////////////////// From bf90445f5a13251f418422923c04138d5d4820e9 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Thu, 9 Nov 2023 23:42:20 -0700 Subject: [PATCH 079/109] #2231 Check log condition first --- src/libcode/vx_grid/unstructured_grid.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/libcode/vx_grid/unstructured_grid.cc b/src/libcode/vx_grid/unstructured_grid.cc index 618854bd73..980d3f1287 100644 --- a/src/libcode/vx_grid/unstructured_grid.cc +++ b/src/libcode/vx_grid/unstructured_grid.cc @@ -136,7 +136,8 @@ void UnstructuredGrid::latlon_to_xy(double lat, double lon, double &x, double &y //if(_distance > 180.0) atlas_geometry.xyz2lonlat(neighbor[0].point(), r_lonlat); //else r_lonlat.assign(neighbor[0].point()[0], neighbor[0].point()[1]); - mlog << Debug(UGRID_DEBUG_LEVEL) << "UnstructuredGrid::latlon_to_xy() " + if(mlog.verbosity_level() >= UGRID_DEBUG_LEVEL) mlog + << Debug(UGRID_DEBUG_LEVEL) << "UnstructuredGrid::latlon_to_xy() " << "input=(" << lon << ", " << lat << ") ==> (" << x << ", " << y << ") == (" << Data.pointLonLat[index].x() << ", " << Data.pointLonLat[index].y() << ") distance= " << distance_km << "km, " @@ -154,7 +155,8 @@ void UnstructuredGrid::xy_to_latlon(double x, double y, double &lat, double &lon lat = Data.pointLonLat[x].y(); lon = Data.pointLonLat[x].x(); - mlog << Debug(UGRID_DEBUG_LEVEL) << "UnstructuredGrid::xy_to_latlon() " + if(mlog.verbosity_level() >= UGRID_DEBUG_LEVEL) mlog + << Debug(UGRID_DEBUG_LEVEL) << "UnstructuredGrid::xy_to_latlon() " << "(" << x << ", " << y << ") ==> (" << lon << ", " << lat << ").\n"; } @@ -397,7 +399,8 @@ void UnstructuredData::set_points(int count, double *_lon, double *_lat) { for (int i=0; i= UGRID_DEBUG_LEVEL) mlog + << Debug(UGRID_DEBUG_LEVEL) << "UnstructuredData::set_points(int, double *, double *) first (" << pointLonLat[0].x() << ", " << pointLonLat[0].y() << ") and last (" << pointLonLat[count-1].x() << ", " << pointLonLat[count-1].y() << ") from (" << _lon[0] << ", " << _lat[0] << ") and (" @@ -418,7 +421,8 @@ void UnstructuredData::set_points(int count, const std::vector &ptL for (int i=0; i &) first: (" + if(mlog.verbosity_level() >= UGRID_DEBUG_LEVEL) mlog + << Debug(UGRID_DEBUG_LEVEL) << "UnstructuredData::set_points(std::vector &) first: (" << pointLonLat[0].x() << ", " << pointLonLat[0].y() << ") and last (" << pointLonLat[count-1].x() << ", " << pointLonLat[count-1].y() << ") from (" << ptLonLat[0].x() << ", " << ptLonLat[0].y() << ") and (" From f9a0f9e111a4241c2bf54be10c3bec24781ac057 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Thu, 9 Nov 2023 23:45:28 -0700 Subject: [PATCH 080/109] #2231 Check ugrid_dataset in order to set ugrid configurations --- src/tools/core/grid_stat/grid_stat.cc | 57 ++++++++++++++----------- src/tools/core/point_stat/point_stat.cc | 33 ++++++++------ 2 files changed, 54 insertions(+), 36 deletions(-) diff --git a/src/tools/core/grid_stat/grid_stat.cc b/src/tools/core/grid_stat/grid_stat.cc index 5a45ecae0b..d50fc93bfb 100644 --- a/src/tools/core/grid_stat/grid_stat.cc +++ b/src/tools/core/grid_stat/grid_stat.cc @@ -299,32 +299,41 @@ void process_command_line(int argc, char **argv) { if (FileType_UGrid == ftype || FileType_UGrid == otype) { #ifdef WITH_UGRID - ConcatString ugrid_nc = conf_info.ugrid_nc; ConcatString ugrid_dataset = conf_info.ugrid_dataset; - ConcatString ugrid_map_config = conf_info.ugrid_map_config; - if (FileType_UGrid == ftype) { - MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)fcst_mtddf; - ugrid_mtddf->set_max_distance_km(conf_info.ugrid_max_distance_km); - if (0 < ugrid_dataset.length()) ugrid_mtddf->set_dataset(ugrid_dataset); - if (0 < ugrid_map_config.length()) - ugrid_mtddf->set_map_config_file(ugrid_map_config); - if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; - ugrid_mtddf->open_metadata(ugrid_nc.c_str()); - mlog << Debug(9) << method_name - << "FCST: ugrid_coordinates_nc: " << ugrid_nc - << " ugrid_max_distance_km: " << conf_info.ugrid_max_distance_km << "\n"; + if (0 < ugrid_dataset.length()) { + double max_distance_km = conf_info.ugrid_max_distance_km; + ConcatString ugrid_nc = conf_info.ugrid_nc; + ConcatString ugrid_map_config_filename = conf_info.ugrid_map_config; + if (FileType_UGrid == ftype) { + MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)fcst_mtddf; + ugrid_mtddf->set_ugrid_configs(ugrid_dataset, max_distance_km, + ugrid_map_config_filename); + if (0 == ugrid_nc.length() || ugrid_nc == "NA") { + ConcatString coordinate_file = ugrid_mtddf->coordinate_file(); + ugrid_nc = (0 < coordinate_file.length()) ? coordinate_file : fcst_file; + } + ugrid_mtddf->open_metadata(ugrid_nc.c_str()); + mlog << Debug(9) << method_name + << "FCST: ugrid_coordinates_nc: " << ugrid_nc + << " ugrid_max_distance_km: " << conf_info.ugrid_max_distance_km << "\n"; + } + if (FileType_UGrid == otype) { + MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)obs_mtddf; + ugrid_mtddf->set_ugrid_configs(ugrid_dataset, max_distance_km, + ugrid_map_config_filename); + if (0 == ugrid_nc.length() || ugrid_nc == "NA") { + ConcatString coordinate_file = ugrid_mtddf->coordinate_file(); + ugrid_nc = (0 < coordinate_file.length()) ? coordinate_file : fcst_file; + } + ugrid_mtddf->open_metadata(ugrid_nc.c_str()); + mlog << Debug(9) << method_name + << "OBS: ugrid_coordinates_nc: " << ugrid_nc + << " ugrid_max_distance_km: " << conf_info.ugrid_max_distance_km << "\n"; + } } - if (FileType_UGrid == otype) { - MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)obs_mtddf; - ugrid_mtddf->set_max_distance_km(conf_info.ugrid_max_distance_km); - if (0 < ugrid_dataset.length()) ugrid_mtddf->set_dataset(ugrid_dataset); - if (0 < ugrid_map_config.length()) - ugrid_mtddf->set_map_config_file(ugrid_map_config); - if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; - ugrid_mtddf->open_metadata(ugrid_nc.c_str()); - mlog << Debug(9) << method_name - << "OBS: ugrid_coordinates_nc: " << ugrid_nc - << " ugrid_max_distance_km: " << conf_info.ugrid_max_distance_km << "\n"; + else { + mlog << Error << "\n" << method_name + << conf_key_ugrid_dataset << " is not defined at the configuration file.\n\n"; } #else ugrid_compile_error(method_name); diff --git a/src/tools/core/point_stat/point_stat.cc b/src/tools/core/point_stat/point_stat.cc index 8902cf62eb..7e88a92b96 100644 --- a/src/tools/core/point_stat/point_stat.cc +++ b/src/tools/core/point_stat/point_stat.cc @@ -306,19 +306,28 @@ void process_command_line(int argc, char **argv) { if (FileType_UGrid == ftype) { #ifdef WITH_UGRID - ConcatString ugrid_nc = conf_info.ugrid_nc; ConcatString ugrid_dataset = conf_info.ugrid_dataset; - ConcatString ugrid_map_config = conf_info.ugrid_map_config; - MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)fcst_mtddf; - ugrid_mtddf->set_max_distance_km(conf_info.ugrid_max_distance_km); - if (0 < ugrid_dataset.length()) ugrid_mtddf->set_dataset(ugrid_dataset); - if (0 < ugrid_map_config.length()) - ugrid_mtddf->set_map_config_file(ugrid_map_config); - if (0 == ugrid_nc.length() || ugrid_nc == "NA") ugrid_nc = fcst_file; - ugrid_mtddf->open_metadata(ugrid_nc.c_str()); - mlog << Debug(9) << method_name - << "ugrid_coordinate_nc: " << ugrid_nc - << " ugrid_max_distance_km: " << conf_info.ugrid_max_distance_km << "\n"; + if (0 < ugrid_dataset.length()) { + double max_distance_km = conf_info.ugrid_max_distance_km; + ConcatString ugrid_nc = conf_info.ugrid_nc; + ConcatString ugrid_map_config_filename = conf_info.ugrid_map_config; + MetUGridDataFile *ugrid_mtddf = (MetUGridDataFile *)fcst_mtddf; + + ugrid_mtddf->set_ugrid_configs(ugrid_dataset, max_distance_km, + ugrid_map_config_filename); + if (0 == ugrid_nc.length() || ugrid_nc == "NA") { + ConcatString coordinate_file = ugrid_mtddf->coordinate_file(); + ugrid_nc = (0 < coordinate_file.length()) ? coordinate_file : fcst_file; + } + ugrid_mtddf->open_metadata(ugrid_nc.c_str()); + mlog << Debug(9) << method_name + << "ugrid_coordinate_nc: " << ugrid_nc + << " ugrid_max_distance_km: " << conf_info.ugrid_max_distance_km << "\n"; + } + else { + mlog << Error << "\n" << method_name + << conf_key_ugrid_dataset << " is not defined at the configuration file.\n\n"; + } #else ugrid_compile_error(method_name); #endif From 3bb3c9af56c02428f38bd183754fce6c662bb665 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Fri, 10 Nov 2023 07:33:22 -0700 Subject: [PATCH 081/109] #2231 Added ugrid settings --- data/config/GridStatConfig_default | 6 ++++++ data/config/PointStatConfig_default | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/data/config/GridStatConfig_default b/data/config/GridStatConfig_default index 4bec5ecf4b..adbb9a214b 100644 --- a/data/config/GridStatConfig_default +++ b/data/config/GridStatConfig_default @@ -264,6 +264,12 @@ nc_pairs_flag = { //////////////////////////////////////////////////////////////////////////////// +ugrid_dataset = ""; +ugrid_max_distance_km = 30; +ugrid_coordinates_file = ""; + +//////////////////////////////////////////////////////////////////////////////// + grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = ""; diff --git a/data/config/PointStatConfig_default b/data/config/PointStatConfig_default index d4b277c6a3..9a8132dccc 100644 --- a/data/config/PointStatConfig_default +++ b/data/config/PointStatConfig_default @@ -299,6 +299,12 @@ output_flag = { //////////////////////////////////////////////////////////////////////////////// +ugrid_dataset = ""; +ugrid_max_distance_km = 30; +ugrid_coordinates_file = ""; + +//////////////////////////////////////////////////////////////////////////////// + tmp_dir = "/tmp"; output_prefix = ""; version = "V12.0.0"; From 8a0fa67fa42803e86085c1074d45607957bdf919 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 14 Nov 2023 11:53:48 -0700 Subject: [PATCH 082/109] #2231 Removed file_type (enabled auto-detection for MPAS data --- .../test_unit/config/GridStatConfig_ugrid_mpas | 5 ++--- .../config/GridStatConfig_ugrid_mpas_diag | 2 -- .../config/PointStatConfig_ugrid_mpas_diag | 11 +++++------ .../config/PointStatConfig_ugrid_mpas_out | 14 ++++++-------- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/internal/test_unit/config/GridStatConfig_ugrid_mpas b/internal/test_unit/config/GridStatConfig_ugrid_mpas index 159f2ec142..db40bb0798 100644 --- a/internal/test_unit/config/GridStatConfig_ugrid_mpas +++ b/internal/test_unit/config/GridStatConfig_ugrid_mpas @@ -28,7 +28,7 @@ obtype = "GFS-ANL"; // Verification grid // regrid = { - to_grid = "${CLIMO_MEAN_FILE}"; + to_grid = OBS; method = BILIN; width = 2; vld_thresh = 0.5; @@ -59,7 +59,6 @@ rank_corr_flag = FALSE; // Forecast and observation fields to be verified // fcst = { - file_type = NETCDF_UGRID; level = [ "P500" ]; @@ -84,7 +83,7 @@ obs = { climo_mean = obs; climo_mean = { - file_name = [ "${CLIMO_MEAN_FILE}" ]; + file_name = []; regrid = { method = NEAREST; diff --git a/internal/test_unit/config/GridStatConfig_ugrid_mpas_diag b/internal/test_unit/config/GridStatConfig_ugrid_mpas_diag index f58bc9c288..c893957e15 100644 --- a/internal/test_unit/config/GridStatConfig_ugrid_mpas_diag +++ b/internal/test_unit/config/GridStatConfig_ugrid_mpas_diag @@ -59,7 +59,6 @@ rank_corr_flag = FALSE; // Forecast and observation fields to be verified // fcst = { - file_type = NETCDF_UGRID; level = [ "P925" ]; @@ -68,7 +67,6 @@ fcst = { ]; } obs = { - file_type = NETCDF_UGRID; level = [ "L3" ]; diff --git a/internal/test_unit/config/PointStatConfig_ugrid_mpas_diag b/internal/test_unit/config/PointStatConfig_ugrid_mpas_diag index 6f03df7ec4..5e87ed2ce5 100644 --- a/internal/test_unit/config/PointStatConfig_ugrid_mpas_diag +++ b/internal/test_unit/config/PointStatConfig_ugrid_mpas_diag @@ -46,7 +46,6 @@ fcst = { obs_quality_inc = []; obs_quality_exc = []; - file_type = NETCDF_UGRID; field = [ { name = "temperature"; level = "P1000-500"; message_type = "ADPSFC"; } ]; @@ -69,7 +68,7 @@ obs = { climo_mean = obs; climo_mean = { - file_name = [ ${CLIMO_FILE} ]; + file_name = []; } //////////////////////////////////////////////////////////////////////////////// @@ -126,10 +125,10 @@ output_flag = { mctc = NONE; mcts = NONE; cnt = BOTH; - sl1l2 = BOTH; - sal1l2 = BOTH; - vl1l2 = BOTH; - val1l2 = BOTH; + sl1l2 = NONE; + sal1l2 = NONE; + vl1l2 = NONE; + val1l2 = NONE; vcnt = BOTH; pct = NONE; pstd = NONE; diff --git a/internal/test_unit/config/PointStatConfig_ugrid_mpas_out b/internal/test_unit/config/PointStatConfig_ugrid_mpas_out index 98c7a1e71f..2cdba532e6 100644 --- a/internal/test_unit/config/PointStatConfig_ugrid_mpas_out +++ b/internal/test_unit/config/PointStatConfig_ugrid_mpas_out @@ -46,10 +46,8 @@ fcst = { obs_quality_inc = []; obs_quality_exc = []; - file_type = NETCDF_UGRID; field = [ - { name = "theta"; level = "(0,*,2-4)"; message_type = "ADPSFC"; } -// { name = "theta"; level = "L4-6"; message_type = "ADPSFC"; } + { name = "theta"; level = "L2-4"; message_type = "ADPSFC"; } ]; } @@ -70,7 +68,7 @@ obs = { climo_mean = obs; climo_mean = { - file_name = [ ${CLIMO_FILE} ]; + file_name = []; } //////////////////////////////////////////////////////////////////////////////// @@ -127,10 +125,10 @@ output_flag = { mctc = NONE; mcts = NONE; cnt = BOTH; - sl1l2 = BOTH; - sal1l2 = BOTH; - vl1l2 = BOTH; - val1l2 = BOTH; + sl1l2 = NONE; + sal1l2 = NONE; + vl1l2 = NONE; + val1l2 = NONE; vcnt = BOTH; pct = NONE; pstd = NONE; From 8ae6c4425de72f5368b5b3f3e32e5e716afaec35 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 14 Nov 2023 11:54:46 -0700 Subject: [PATCH 083/109] #2231 Removed sl1l2 and sal1l2 output which have no data line --- internal/test_unit/xml/unit_ugrid.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/internal/test_unit/xml/unit_ugrid.xml b/internal/test_unit/xml/unit_ugrid.xml index 29834d70e4..a77d95d886 100644 --- a/internal/test_unit/xml/unit_ugrid.xml +++ b/internal/test_unit/xml/unit_ugrid.xml @@ -23,7 +23,6 @@ &MET_BIN;/grid_stat - CLIMO_MEAN_FILE &DATA_DIR_CLIMO;/NCEP_2.5deg/pgba_mean.19590415 OUTPUT_PREFIX UGRID_MPAS_OUT_TO_GRID \ @@ -69,7 +68,6 @@ END_DS 1800 OUTPUT_PREFIX UGRID_MPAS_DIAG_TEMP CONFIG_DIR &CONFIG_DIR; - CLIMO_FILE "&DATA_DIR_MODEL;/grib1/gfs/gfs_2012040900_F012_gNam.grib" \ &DATA_DIR_UGRID;/mpas/diag.2012-04-09_12.00.00_reduced.nc \ @@ -83,8 +81,6 @@ &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_ctc.txt &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_cts.txt &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_cnt.txt - &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_sl1l2.txt - &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_sal1l2.txt &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_eclv.txt &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_DIAG_TEMP_000000L_20120409_120000V_mpr.txt @@ -97,7 +93,6 @@ END_DS 1800 OUTPUT_PREFIX UGRID_MPAS_OUT_TEMP CONFIG_DIR &CONFIG_DIR; - CLIMO_FILE "&DATA_DIR_MODEL;/grib1/gfs/gfs_2012040900_F012_gNam.grib" \ &DATA_DIR_UGRID;/mpas/mpasout.2012-04-09_12.00.00_reduced.nc \ @@ -111,8 +106,6 @@ &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_ctc.txt &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_cts.txt &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_cnt.txt - &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_sl1l2.txt - &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_sal1l2.txt &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_eclv.txt &OUTPUT_DIR;/point_stat_ugrid/point_stat_UGRID_MPAS_OUT_TEMP_000000L_20120409_120000V_mpr.txt From a80db9ea8837d73cc2b8def5256c366aab497881 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 14 Nov 2023 11:57:06 -0700 Subject: [PATCH 084/109] #2231 Added is_ugrid_file to detect UGrid dfata by looking at the global attributes for MPAS and LFRic --- .../vx_data2d_factory/data2d_factory_utils.cc | 5 +- .../vx_data2d_factory/is_netcdf_file.cc | 55 ++++++++++++++++--- .../vx_data2d_factory/is_netcdf_file.h | 1 + 3 files changed, 51 insertions(+), 10 deletions(-) diff --git a/src/libcode/vx_data2d_factory/data2d_factory_utils.cc b/src/libcode/vx_data2d_factory/data2d_factory_utils.cc index db5672046f..5c6d7e991e 100644 --- a/src/libcode/vx_data2d_factory/data2d_factory_utils.cc +++ b/src/libcode/vx_data2d_factory/data2d_factory_utils.cc @@ -101,6 +101,7 @@ else if ( is_ncpinterp_file (filename) ) data_type = FileType_NcPinterp; else if ( is_nccf_file (filename) ) data_type = FileType_NcCF; else if ( is_ncmet_file (filename) ) data_type = FileType_NcMet; else if ( is_bufr_file (filename) ) data_type = FileType_Bufr; +else if ( is_ugrid_file (filename) ) data_type = FileType_UGrid; else data_type = FileType_None; // @@ -118,8 +119,8 @@ if ( suffix_type != FileType_None && suffix_type != data_type ) { } -if ( suffix_type != FileType_None ) return ( suffix_type ); -else return ( data_type ); +if ( suffix_type != FileType_None ) return suffix_type; +else return data_type ; } diff --git a/src/libcode/vx_data2d_factory/is_netcdf_file.cc b/src/libcode/vx_data2d_factory/is_netcdf_file.cc index b96c720079..0f121dc26a 100644 --- a/src/libcode/vx_data2d_factory/is_netcdf_file.cc +++ b/src/libcode/vx_data2d_factory/is_netcdf_file.cc @@ -43,6 +43,7 @@ static const int netcdf_magic_len = m_strlen(netcdf_magic); static const string nccf_att_value = "CF-"; static const string nccf_att_value2 = "CF "; static const string nccf_att_value3 = "COARDS"; +static const string ugrid_att_value = "UGRID"; static const string ncmet_att_version = "MET_version"; static const string ncmet_att_projection = "Projection"; @@ -50,34 +51,36 @@ static const string ncmet_att_projection = "Projection"; static const string ncpinterp_att_name = "TITLE"; static const char ncpinterp_att_value [] = "ON PRES LEVELS"; +static const string mesh_spec_att_name = "mesh_spec"; + //////////////////////////////////////////////////////////////////////// bool is_netcdf_file(const char * filename) { - if ( !filename || !(*filename) ) return ( false ); + if ( !filename || !(*filename) ) return false; int fd = -1; int n_read; char buf[netcdf_magic_len]; - if ( (fd = open(filename, O_RDONLY)) < 0 ) return ( false ); + if ( (fd = open(filename, O_RDONLY)) < 0 ) return false; n_read = read(fd, buf, netcdf_magic_len); close(fd); - if ( n_read != netcdf_magic_len ) return ( false ); + if ( n_read != netcdf_magic_len ) return false; if ( strncmp(buf, netcdf_magic, netcdf_magic_len) == 0 - || strncmp(buf, hdf_magic, netcdf_magic_len) == 0) return ( true ); + || strncmp(buf, hdf_magic, netcdf_magic_len) == 0) return true; // // done // - return ( false ); + return false; } @@ -110,7 +113,7 @@ bool is_nccf_file(const char * filename) catch(...) { } - return ( status ); + return status; } @@ -136,7 +139,7 @@ bool is_ncmet_file(const char * filename) }catch(...) { } - return ( status ); + return status; } @@ -164,7 +167,43 @@ bool is_ncpinterp_file(const char * filename) }catch(...) { } - return ( status ); + return status; + +} + + +//////////////////////////////////////////////////////////////////////// + + +bool is_ugrid_file(const char * filename) +{ + bool status = false; + try { + ConcatString att_val; + NcFile *nc_file = open_ncfile(filename); + + if (!IS_INVALID_NC_P(nc_file)) { + // Get the global attribute + // Check Conventions attrribute (Conventions= "UGRID") + if (get_cf_conventions(nc_file, att_val)) { + status = (0 == att_val.compare(0, ugrid_att_value.length(), + ugrid_att_value)); + } + if (!status) { + status = get_global_att(nc_file, mesh_spec_att_name, att_val); // for MPAS + //if (!status) { + // // Check the attribute value for the target string + // status = (strstr(att_val.c_str(), ncpinterp_att_value)); + //} + } + } + + delete nc_file; + + }catch(...) { + } + + return status; } diff --git a/src/libcode/vx_data2d_factory/is_netcdf_file.h b/src/libcode/vx_data2d_factory/is_netcdf_file.h index 4c916fc3e6..170a5d4c0f 100644 --- a/src/libcode/vx_data2d_factory/is_netcdf_file.h +++ b/src/libcode/vx_data2d_factory/is_netcdf_file.h @@ -29,6 +29,7 @@ extern bool is_ncmet_file(const char * filename); extern bool is_ncpinterp_file(const char * filename); +extern bool is_ugrid_file(const char * filename); //////////////////////////////////////////////////////////////////////// From c8fd9cd8f083e641323ecbbd90d9690125e94f83 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 14 Nov 2023 12:00:43 -0700 Subject: [PATCH 085/109] #2231 Set the magic string for L and P notation at the level --- src/libcode/vx_data2d_ugrid/var_info_ugrid.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc b/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc index 47cd9bf159..1129a9eec5 100644 --- a/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc +++ b/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc @@ -169,10 +169,10 @@ void VarInfoUGrid::set_magic(const ConcatString &nstr, const ConcatString &lstr) // If there's no level specification, assume (*, *) if(strchr(lstr.c_str(), '(') == nullptr) { - Level.set_req_name("*,*"); - Level.set_name("*,*"); + Level.set_req_name("0,*"); + Level.set_name("0,*"); clear_dimension(); - add_dimension(vx_data2d_star); + add_dimension(0); add_dimension(vx_data2d_star); } else { @@ -344,9 +344,13 @@ void VarInfoUGrid::set_dict(Dictionary &dict){ if (cfg_level.length() > 0) lvl_type = cfg_level.char_at(0); if (lvl_type == 'A' || lvl_type == 'Z' || lvl_type == 'P' || - lvl_type == 'R' || lvl_type == 'L') set_level_info_grib(dict); + lvl_type == 'R' || lvl_type == 'L') { + set_level_info_grib(dict); + VarInfo::set_magic(cfg_name, cfg_level); + } else set_magic(cfg_name, cfg_level); + set_req_name(cfg_name.c_str()); return; From d8e2852a4301e6d1c0c20e35df7ec69d302108b1 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 14 Nov 2023 12:01:39 -0700 Subject: [PATCH 086/109] #2231 Removed max_distance_km at the log message --- src/libcode/vx_grid/unstructured_grid.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libcode/vx_grid/unstructured_grid.cc b/src/libcode/vx_grid/unstructured_grid.cc index 980d3f1287..7a7f2312c6 100644 --- a/src/libcode/vx_grid/unstructured_grid.cc +++ b/src/libcode/vx_grid/unstructured_grid.cc @@ -142,8 +142,7 @@ void UnstructuredGrid::latlon_to_xy(double lat, double lon, double &x, double &y << Data.pointLonLat[index].x() << ", " << Data.pointLonLat[index].y() << ") distance= " << distance_km << "km, " << _pointLonLat.distance(Data.pointLonLat[index]) - << " degree, is_rejected: " << is_rejected - << ", max_distanc=" << Data.max_distance_km<< "\n"; + << " degree" << (is_rejected ? ", rejected" : " ") << "\n"; } From d6fcfd6f7176f7ecd7c5d7b565ce554e2f918d88 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 14 Nov 2023 12:02:48 -0700 Subject: [PATCH 087/109] #2231 Added log message with failure on reading fcst/obs --- src/tools/core/grid_stat/grid_stat.cc | 4 ++-- src/tools/core/point_stat/point_stat.cc | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/tools/core/grid_stat/grid_stat.cc b/src/tools/core/grid_stat/grid_stat.cc index d50fc93bfb..67b8379d0f 100644 --- a/src/tools/core/grid_stat/grid_stat.cc +++ b/src/tools/core/grid_stat/grid_stat.cc @@ -279,14 +279,14 @@ void process_command_line(int argc, char **argv) { // Read forecast file if(!(fcst_mtddf = mtddf_factory.new_met_2d_data_file(fcst_file.c_str(), ftype))) { mlog << Error << "\nTrouble reading forecast file \"" - << fcst_file << "\"\n\n"; + << fcst_file << "\". Override the FileType with \"file_type = FileType_;\"\n\n"; exit(1); } // Read observation file if(!(obs_mtddf = mtddf_factory.new_met_2d_data_file(obs_file.c_str(), otype))) { mlog << Error << "\nTrouble reading observation file \"" - << obs_file << "\"\n\n"; + << obs_file << "\". Override the FileType with \"file_type = FileType_;\"\n\n"; exit(1); } diff --git a/src/tools/core/point_stat/point_stat.cc b/src/tools/core/point_stat/point_stat.cc index 7e88a92b96..7b4d886ae6 100644 --- a/src/tools/core/point_stat/point_stat.cc +++ b/src/tools/core/point_stat/point_stat.cc @@ -291,7 +291,7 @@ void process_command_line(int argc, char **argv) { // Read forecast file if(!(fcst_mtddf = mtddf_factory.new_met_2d_data_file(fcst_file.c_str(), ftype))) { mlog << Error << "\n" << method_name << "Trouble reading forecast file \"" - << fcst_file << "\"\n\n"; + << fcst_file << "\". Override the FileType with \"file_type = FileType_;\"\n\n"; exit(1); } @@ -604,7 +604,6 @@ void process_fcst_climo_files() { // Read the gridded data from the input forecast file n_fcst = fcst_mtddf->data_plane_array( *conf_info.vx_opt[i].vx_pd.fcst_info, fcst_dpa); - mlog << Debug(2) << "\n" << sep_str << "\n\n" << "Reading data for " From 66c504ebfab09f4b9073661e75564ca218a44881 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 14 Nov 2023 12:03:27 -0700 Subject: [PATCH 088/109] #2231 Added log message --- src/basic/vx_config/config_file.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/vx_config/config_file.cc b/src/basic/vx_config/config_file.cc index 83edcebb3f..daee7b2cd6 100644 --- a/src/basic/vx_config/config_file.cc +++ b/src/basic/vx_config/config_file.cc @@ -352,7 +352,7 @@ met_open(configfilein, filename); if ( ! configfilein ) { mlog << Error << "\nMetConfig::read(const char *) -> " - << "unable to open input file \"" << filename << "\"\n\n"; + << "unable to open input file \"" << filename << "\". Please specify \"file_type = FileType_;\" at the configration file\n\n"; exit ( 1 ); From 2681986141a62fb6bdc7aa6428e2cb1544203072 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 14 Nov 2023 12:04:49 -0700 Subject: [PATCH 089/109] #2231 Restore variable name when the data_plane array is built from multiple variables --- src/libcode/vx_data2d_ugrid/data2d_ugrid.cc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc index d9e0fde151..05d8ea7a5e 100644 --- a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc @@ -170,7 +170,6 @@ bool MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane) { bool status = false; NcVarInfo *data_var = (NcVarInfo *)nullptr; - VarInfoUGrid *vinfo_nc = (VarInfoUGrid *)&vinfo; const long time_cnt = (long)_file->ValidTime.n(); static const string method_name = "MetUGridDataFile::data_plane(VarInfo &, DataPlane &) -> "; @@ -179,7 +178,8 @@ bool MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane) plane.clear(); - data_var = _file->find_by_name(vinfo_nc->req_name().c_str()); + ConcatString req_name = vinfo.req_name(); + data_var = _file->find_by_name(req_name.c_str()); if (nullptr != data_var) { // Read the data status = data_plane(vinfo, plane, data_var); @@ -189,20 +189,21 @@ bool MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane) long lvl_lower = level.lower(); long lvl_upper = level.upper(); vector vinfo_list; - if (_file->find_nc_vinfo_list(vinfo_nc->req_name().c_str(), vinfo_list)) { + if (_file->find_nc_vinfo_list(req_name.c_str(), vinfo_list)) { for (int idx=0; idxreq_name(), vinfo_list[idx]->name.c_str()); + int vlevel = extract_vlevels(req_name, vinfo_list[idx]->name.c_str()); if (vlevel >= lvl_lower && vlevel <= lvl_upper) { vinfo.set_req_name(vinfo_list[idx]->name.c_str()); status = data_plane(vinfo, plane, vinfo_list[idx]); if (status) { mlog << Debug(5) << method_name - << "Found range match for VarInfo \"" << vinfo_nc->req_name() + << "Found range match for VarInfo \"" << req_name << " (" << vinfo_list[idx]->name << ")\"\n"; break; } } } + vinfo.set_name(req_name.c_str()); // restore the name } } @@ -244,6 +245,7 @@ bool MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane, NcVarInfo *d for (int idx=0; idxNdims; idx++) { long offset = 0; if (zdim_slot == idx &&_cur_vert_index >= 0) offset = _cur_vert_index; + else if (time_dim_slot != idx) offset = vx_data2d_star; dimension.add(offset); is_offset.add(true); } @@ -354,6 +356,7 @@ int MetUGridDataFile::data_plane_array(VarInfo &vinfo, << " (" << vinfo_list[idx]->name << ")\"\n"; } } + vinfo.set_name(req_name.c_str()); } else { mlog << Error << "\n" << method_name From 9d70e3e8e9c0051404fcdab8c4f6d44d3f083d4c Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Tue, 14 Nov 2023 12:05:22 -0700 Subject: [PATCH 090/109] #2231 Corretced data read dimension --- src/libcode/vx_data2d_ugrid/ugrid_file.cc | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.cc b/src/libcode/vx_data2d_ugrid/ugrid_file.cc index 0ebaddbe2b..04f4788d5a 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.cc +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.cc @@ -694,18 +694,21 @@ bool UGridFile::getData(NcVar * v, const LongArray & a, DataPlane & plane) const const int plane_size = nx * ny; double *d = new double[plane_size]; + int length; size_t dim_size; LongArray offsets; LongArray lengths; for (int k=0; kt_slot && k != var->z_slot) length = plane_size - a[k]; } + lengths.add(length); dim_size = v->getDim(k).getSize(); if (dim_size < offsets[k]) { mlog << Error << "\n" << method_name @@ -716,14 +719,21 @@ bool UGridFile::getData(NcVar * v, const LongArray & a, DataPlane & plane) const } } - get_nc_data(v, d, lengths, offsets); int offset = 0; + double min_value, max_value; + + min_value = 10e10; + max_value = -min_value; for (int x = 0; x< nx; ++x) { double value = d[x]; if( is_eq(value, missing_value) || is_eq(value, fill_value) ) { - value = bad_data_double; + value = bad_data_double; + } + else { + if (min_value > value) min_value = value; + if (max_value < value) max_value = value; } plane.set(value, x, 0); @@ -737,9 +747,10 @@ bool UGridFile::getData(NcVar * v, const LongArray & a, DataPlane & plane) const for (int idx=0; idx Date: Wed, 15 Nov 2023 10:35:00 -0700 Subject: [PATCH 091/109] #2231 Added MPAS at Conventions as ugrid --- src/libcode/vx_data2d_factory/is_netcdf_file.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/libcode/vx_data2d_factory/is_netcdf_file.cc b/src/libcode/vx_data2d_factory/is_netcdf_file.cc index 0f121dc26a..f6f0856009 100644 --- a/src/libcode/vx_data2d_factory/is_netcdf_file.cc +++ b/src/libcode/vx_data2d_factory/is_netcdf_file.cc @@ -43,6 +43,7 @@ static const int netcdf_magic_len = m_strlen(netcdf_magic); static const string nccf_att_value = "CF-"; static const string nccf_att_value2 = "CF "; static const string nccf_att_value3 = "COARDS"; +static const string mpas_att_value = "MPAS"; static const string ugrid_att_value = "UGRID"; static const string ncmet_att_version = "MET_version"; @@ -184,21 +185,18 @@ bool is_ugrid_file(const char * filename) if (!IS_INVALID_NC_P(nc_file)) { // Get the global attribute - // Check Conventions attrribute (Conventions= "UGRID") + // Check Conventions attrribute (Conventions= "UGRID" or "MPAS") if (get_cf_conventions(nc_file, att_val)) { status = (0 == att_val.compare(0, ugrid_att_value.length(), - ugrid_att_value)); + ugrid_att_value) + || 0 == att_val.compare(0, mpas_att_value.length(), + mpas_att_value)); } if (!status) { status = get_global_att(nc_file, mesh_spec_att_name, att_val); // for MPAS - //if (!status) { - // // Check the attribute value for the target string - // status = (strstr(att_val.c_str(), ncpinterp_att_value)); - //} } } - - delete nc_file; + if (nullptr != nc_file) delete nc_file; }catch(...) { } From 859393a42ab44e4c1c0515152f00afeda4a084e5 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Wed, 15 Nov 2023 10:36:54 -0700 Subject: [PATCH 092/109] #2231 Detect UGrid data and gives a proper error message --- .../other/plot_data_plane/plot_data_plane.cc | 6 ++++++ src/tools/other/plot_point_obs/plot_point_obs.cc | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/tools/other/plot_data_plane/plot_data_plane.cc b/src/tools/other/plot_data_plane/plot_data_plane.cc index 890dc1d148..646e51066f 100644 --- a/src/tools/other/plot_data_plane/plot_data_plane.cc +++ b/src/tools/other/plot_data_plane/plot_data_plane.cc @@ -143,6 +143,12 @@ int met_main(int argc, char * argv[]) { exit(1); } + if (FileType_UGrid == met_ptr->file_type()) { + mlog << Error << "\n" << program_name << " -> filetype " + << grdfiletype_to_string(met_ptr->file_type()) << " is not supported\n\n"; + exit(1); + } + var_ptr = v_factory.new_var_info(met_ptr->file_type()); if(!var_ptr) { diff --git a/src/tools/other/plot_point_obs/plot_point_obs.cc b/src/tools/other/plot_point_obs/plot_point_obs.cc index 1a48fba94f..b5d8758161 100644 --- a/src/tools/other/plot_point_obs/plot_point_obs.cc +++ b/src/tools/other/plot_point_obs/plot_point_obs.cc @@ -45,6 +45,7 @@ using namespace std; #include "main.h" #include "plot_point_obs.h" +#include "is_netcdf_file.h" #include "data_plane_plot.h" #include "vx_ps.h" #include "vx_pxm.h" @@ -185,6 +186,20 @@ void process_point_obs(const char *point_obs_filename) { if (use_python) python_compile_error(method_name); #endif { + if (!file_exists(point_obs_filename)) { + mlog << Error << "\n" << method_name + << point_obs_filename << " does not exist.\n\n"; + + exit(1); + } + + if(is_ugrid_file(point_obs_filename)) { + mlog << Error << "\n" << program_name << " -> filetype " + << grdfiletype_to_string(FileType_UGrid) << " is not supported\n\n"; + + exit(1); + } + if(!nc_point_obs.open(point_obs_filename)) { nc_point_obs.close(); From a639b4f6778df2454aa4ad6cc182b4d9d77516c7 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Wed, 15 Nov 2023 10:55:20 -0700 Subject: [PATCH 093/109] Per #2231, this branch has been upgraded to using dtcenter/met-base:v3.1 which is created using the Debian 12 (bookworm) as the base image. This updates autoconf from version 2.69 to 2.71, which produces changes in its output files, including all of the Makefile.in files. Committing this updated output to this branch. --- Makefile.in | 54 +- aclocal.m4 | 81 +- compile | 6 +- config.guess | 1500 +++-- config.h.in | 7 +- config.sub | 2609 ++++---- configure | 5818 ++++++++++------- data/Makefile.in | 13 +- data/climo/Makefile.in | 13 +- data/climo/seeps/Makefile.in | 11 +- data/colortables/Makefile.in | 13 +- data/colortables/NCL_colortables/Makefile.in | 11 +- data/config/Makefile.in | 11 +- data/map/Makefile.in | 15 +- data/map/admin_by_country/Makefile.in | 11 +- data/poly/HMT_masks/Makefile.in | 11 +- data/poly/Makefile.in | 13 +- data/poly/NCEP_masks/Makefile.in | 11 +- data/ps/Makefile.in | 11 +- data/table_files/Makefile.in | 11 +- data/tc_data/Makefile.in | 11 +- depcomp | 2 +- install-sh | 161 +- internal/test_util/Makefile.in | 13 +- internal/test_util/basic/Makefile.in | 13 +- .../test_util/basic/vx_config/Makefile.in | 13 +- internal/test_util/basic/vx_log/Makefile.in | 13 +- internal/test_util/basic/vx_util/Makefile.in | 13 +- internal/test_util/libcode/Makefile.in | 13 +- .../test_util/libcode/vx_data2d/Makefile.in | 13 +- .../libcode/vx_data2d_factory/Makefile.in | 13 +- .../libcode/vx_data2d_grib/Makefile.in | 13 +- .../libcode/vx_data2d_nc_met/Makefile.in | 13 +- .../libcode/vx_data2d_nccf/Makefile.in | 13 +- .../test_util/libcode/vx_geodesy/Makefile.in | 13 +- .../test_util/libcode/vx_grid/Makefile.in | 13 +- .../test_util/libcode/vx_nc_util/Makefile.in | 13 +- .../test_util/libcode/vx_physics/Makefile.in | 13 +- .../libcode/vx_plot_util/Makefile.in | 13 +- internal/test_util/libcode/vx_ps/Makefile.in | 13 +- .../libcode/vx_series_data/Makefile.in | 13 +- .../test_util/libcode/vx_solar/Makefile.in | 13 +- .../test_util/libcode/vx_tc_util/Makefile.in | 13 +- internal/test_util/tools/Makefile.in | 13 +- internal/test_util/tools/other/Makefile.in | 13 +- .../tools/other/mode_time_domain/Makefile.in | 13 +- missing | 2 +- scripts/Rscripts/Makefile.in | 13 +- scripts/Rscripts/include/Makefile.in | 11 +- scripts/python/Makefile.in | 13 +- scripts/python/examples/Makefile.in | 11 +- scripts/python/met/Makefile.in | 11 +- scripts/python/pyembed/Makefile.in | 13 +- scripts/python/tc_diag/Makefile.in | 11 +- scripts/python/utility/Makefile.in | 11 +- src/Makefile.in | 13 +- src/basic/Makefile.in | 13 +- src/basic/enum_to_string/Makefile.in | 13 +- src/basic/vx_cal/Makefile.in | 13 +- src/basic/vx_config/Makefile.in | 13 +- src/basic/vx_log/Makefile.in | 13 +- src/basic/vx_math/Makefile.in | 13 +- src/basic/vx_util/Makefile.in | 13 +- src/basic/vx_util_math/Makefile.in | 13 +- src/libcode/Makefile.in | 13 +- src/libcode/vx_afm/Makefile.in | 13 +- src/libcode/vx_analysis_util/Makefile.in | 13 +- src/libcode/vx_bool_calc/Makefile.in | 13 +- src/libcode/vx_color/Makefile.in | 13 +- src/libcode/vx_data2d/Makefile.in | 13 +- src/libcode/vx_data2d_factory/Makefile.in | 13 +- src/libcode/vx_data2d_grib/Makefile.in | 13 +- src/libcode/vx_data2d_grib2/Makefile.in | 13 +- src/libcode/vx_data2d_nc_met/Makefile.in | 13 +- src/libcode/vx_data2d_nc_pinterp/Makefile.in | 13 +- src/libcode/vx_data2d_nccf/Makefile.in | 13 +- src/libcode/vx_data2d_python/Makefile.in | 13 +- src/libcode/vx_data2d_ugrid/Makefile.in | 13 +- src/libcode/vx_geodesy/Makefile.in | 13 +- src/libcode/vx_gis/Makefile.in | 13 +- src/libcode/vx_gnomon/Makefile.in | 13 +- src/libcode/vx_grid/Makefile.in | 13 +- src/libcode/vx_gsl_prob/Makefile.in | 13 +- src/libcode/vx_nav/Makefile.in | 13 +- src/libcode/vx_nc_obs/Makefile.in | 13 +- src/libcode/vx_nc_util/Makefile.in | 13 +- src/libcode/vx_pb_util/Makefile.in | 13 +- src/libcode/vx_physics/Makefile.in | 13 +- src/libcode/vx_plot_util/Makefile.in | 13 +- src/libcode/vx_pointdata_python/Makefile.in | 13 +- src/libcode/vx_ps/Makefile.in | 13 +- src/libcode/vx_pxm/Makefile.in | 13 +- src/libcode/vx_python3_utils/Makefile.in | 13 +- src/libcode/vx_regrid/Makefile.in | 13 +- src/libcode/vx_render/Makefile.in | 13 +- src/libcode/vx_seeps/Makefile.in | 13 +- src/libcode/vx_series_data/Makefile.in | 13 +- src/libcode/vx_shapedata/Makefile.in | 13 +- src/libcode/vx_solar/Makefile.in | 13 +- src/libcode/vx_stat_out/Makefile.in | 13 +- src/libcode/vx_statistics/Makefile.in | 13 +- src/libcode/vx_summary/Makefile.in | 13 +- src/libcode/vx_tc_util/Makefile.in | 13 +- src/libcode/vx_time_series/Makefile.in | 13 +- src/tools/Makefile.in | 13 +- src/tools/core/Makefile.in | 13 +- src/tools/core/ensemble_stat/Makefile.in | 13 +- src/tools/core/grid_stat/Makefile.in | 13 +- src/tools/core/mode/Makefile.in | 13 +- src/tools/core/mode_analysis/Makefile.in | 13 +- src/tools/core/pcp_combine/Makefile.in | 13 +- src/tools/core/point_stat/Makefile.in | 13 +- src/tools/core/series_analysis/Makefile.in | 13 +- src/tools/core/stat_analysis/Makefile.in | 13 +- src/tools/core/wavelet_stat/Makefile.in | 13 +- src/tools/dev_utils/Makefile.in | 13 +- src/tools/dev_utils/shapefiles/Makefile.in | 13 +- src/tools/other/Makefile.in | 13 +- src/tools/other/ascii2nc/Makefile.in | 13 +- src/tools/other/gen_ens_prod/Makefile.in | 13 +- src/tools/other/gen_vx_mask/Makefile.in | 13 +- src/tools/other/gis_utils/Makefile.in | 13 +- src/tools/other/grid_diag/Makefile.in | 13 +- src/tools/other/gsi_tools/Makefile.in | 13 +- src/tools/other/ioda2nc/Makefile.in | 13 +- src/tools/other/lidar2nc/Makefile.in | 13 +- src/tools/other/madis2nc/Makefile.in | 13 +- src/tools/other/mode_graphics/Makefile.in | 13 +- src/tools/other/mode_time_domain/Makefile.in | 13 +- src/tools/other/modis_regrid/Makefile.in | 13 +- src/tools/other/pb2nc/Makefile.in | 13 +- src/tools/other/plot_data_plane/Makefile.in | 13 +- src/tools/other/plot_point_obs/Makefile.in | 13 +- src/tools/other/point2grid/Makefile.in | 13 +- src/tools/other/regrid_data_plane/Makefile.in | 13 +- src/tools/other/shift_data_plane/Makefile.in | 13 +- src/tools/other/wwmca_tool/Makefile.in | 13 +- src/tools/tc_utils/Makefile.in | 13 +- src/tools/tc_utils/rmw_analysis/Makefile.in | 13 +- src/tools/tc_utils/tc_diag/Makefile.in | 13 +- src/tools/tc_utils/tc_dland/Makefile.in | 13 +- src/tools/tc_utils/tc_gen/Makefile.in | 13 +- src/tools/tc_utils/tc_pairs/Makefile.in | 13 +- src/tools/tc_utils/tc_rmw/Makefile.in | 13 +- src/tools/tc_utils/tc_stat/Makefile.in | 13 +- ylwrap | 2 +- 146 files changed, 6546 insertions(+), 5425 deletions(-) diff --git a/Makefile.in b/Makefile.in index 692b81fde9..c8afa46537 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -136,8 +136,8 @@ am__recursive_targets = \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir distdir-am dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -154,14 +154,11 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope DIST_SUBDIRS = data src scripts/Rscripts scripts/python \ internal/test_util am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in INSTALL \ - compile config.guess config.sub depcomp install-sh missing \ - ylwrap + README.md compile config.guess config.sub depcomp install-sh \ + missing ylwrap DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -200,6 +197,8 @@ am__relativize = \ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best DIST_TARGETS = dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -215,8 +214,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -226,13 +226,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -534,7 +533,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -621,6 +619,10 @@ dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -663,6 +665,8 @@ distcheck: dist eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -678,7 +682,7 @@ distcheck: dist $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -840,17 +844,17 @@ uninstall-am: am--refresh check check-am clean clean-cscope clean-generic \ cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - 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-am uninstall \ - uninstall-am + dist-zip dist-zstd distcheck distclean distclean-generic \ + distclean-hdr 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-am uninstall uninstall-am .PRECIOUS: Makefile diff --git a/aclocal.m4 b/aclocal.m4 index 3aee821715..b58d8d33ae 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,13 +14,13 @@ 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.71],, +[m4_warning([this file was generated for autoconf 2.71. 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'.])]) -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.16' 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.16.1], [], +m4_if([$1], [1.16.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ 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.16.1])dnl +[AM_AUTOMAKE_VERSION([1.16.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_COND_IF -*- Autoconf -*- -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -147,7 +147,7 @@ fi[]dnl # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -178,7 +178,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -369,7 +369,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -408,7 +408,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -435,7 +437,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -463,6 +465,10 @@ m4_defn([AC_PROG_CC]) # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl +m4_ifdef([_$0_ALREADY_INIT], + [m4_fatal([$0 expanded multiple times +]m4_defn([_$0_ALREADY_INIT]))], + [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -499,7 +505,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl @@ -551,6 +557,20 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [m4_define([AC_PROG_OBJCXX], m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi +AC_SUBST([CTAGS]) +if test -z "$ETAGS"; then + ETAGS=etags +fi +AC_SUBST([ETAGS]) +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi +AC_SUBST([CSCOPE]) + AC_REQUIRE([AM_SILENT_RULES])dnl dnl The testsuite driver may need to know about EXEEXT, so add the dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This @@ -632,7 +652,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -653,7 +673,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -674,7 +694,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -717,7 +737,7 @@ AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -738,12 +758,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -756,7 +771,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -785,7 +800,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -832,7 +847,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -851,7 +866,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -932,7 +947,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -992,7 +1007,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1020,7 +1035,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1039,7 +1054,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/compile b/compile index 99e50524b3..df363c8fbf 100755 --- a/compile +++ b/compile @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ func_file_conv () MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ func_file_conv () mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff --git a/config.guess b/config.guess index f50dcdb6de..7f76b6228f 100755 --- a/config.guess +++ b/config.guess @@ -1,12 +1,14 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2018 Free Software Foundation, Inc. +# Copyright 1992-2022 Free Software Foundation, Inc. -timestamp='2018-02-24' +# shellcheck disable=SC2006,SC2268 # see below for rationale + +timestamp='2022-01-09' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -27,11 +29,19 @@ timestamp='2018-02-24' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess # # Please send patches to . +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + + me=`echo "$0" | sed -e 's,.*/,,'` usage="\ @@ -50,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2018 Free Software Foundation, Inc. +Copyright 1992-2022 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -84,7 +94,8 @@ if test $# != 0; then exit 1 fi -trap 'exit 1' 1 2 15 +# Just in case it came from the environment. +GUESS= # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires @@ -96,73 +107,90 @@ trap 'exit 1' 1 2 15 # Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > "$dummy.c" ; - for c in cc gcc c89 c99 ; do - if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +tmp= +# shellcheck disable=SC2172 +trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 + +set_cc_for_build() { + # prevent multiple calls if $tmp is already set + test "$tmp" && return 0 + : "${TMPDIR=/tmp}" + # shellcheck disable=SC2039,SC3028 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } + dummy=$tmp/dummy + case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in + ,,) echo "int x;" > "$dummy.c" + for driver in cc gcc c89 c99 ; do + if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD=$driver + break + fi + done + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; + esac +} # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then +if test -f /.attbin/uname ; then PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "$UNAME_SYSTEM" in +case $UNAME_SYSTEM in Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu + LIBC=unknown - eval "$set_cc_for_build" + set_cc_for_build cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc - #else + #elif defined(__GLIBC__) LIBC=gnu + #else + #include + /* First heuristic to detect musl libc. */ + #ifdef __DEFINED_va_list + LIBC=musl + #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "$cc_set_libc" - # If ldd exists, use it to detect musl libc. - if command -v ldd >/dev/null && \ - ldd --version 2>&1 | grep -q ^musl - then - LIBC=musl + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in +case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -174,12 +202,12 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - "/sbin/$sysctl" 2>/dev/null || \ - "/usr/sbin/$sysctl" 2>/dev/null || \ + /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ echo unknown)` - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; @@ -188,18 +216,18 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in earmv*) arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` - machine="${arch}${endian}"-unknown + machine=${arch}${endian}-unknown ;; - *) machine="$UNAME_MACHINE_ARCH"-unknown ;; + *) machine=$UNAME_MACHINE_ARCH-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval "$set_cc_for_build" + set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -215,7 +243,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in ;; esac # Determine ABI tags. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` @@ -226,7 +254,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "$UNAME_VERSION" in + case $UNAME_VERSION in Debian*) release='-gnu' ;; @@ -237,45 +265,57 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "$machine-${os}${release}${abi}" - exit ;; + GUESS=$machine-${os}${release}${abi-} + ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE + ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE + ;; + *:SecBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` + GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE + ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE + ;; *:MidnightBSD:*:*) - echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE + ;; *:ekkoBSD:*:*) - echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE + ;; *:SolidBSD:*:*) - echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE + ;; + *:OS108:*:*) + GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE + ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE + ;; *:MirBSD:*:*) - echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE + ;; *:Sortix:*:*) - echo "$UNAME_MACHINE"-unknown-sortix - exit ;; + GUESS=$UNAME_MACHINE-unknown-sortix + ;; + *:Twizzler:*:*) + GUESS=$UNAME_MACHINE-unknown-twizzler + ;; *:Redox:*:*) - echo "$UNAME_MACHINE"-unknown-redox - exit ;; + GUESS=$UNAME_MACHINE-unknown-redox + ;; mips:OSF1:*.*) - echo mips-dec-osf1 - exit ;; + GUESS=mips-dec-osf1 + ;; alpha:OSF1:*:*) + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + trap '' 0 case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -289,7 +329,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in + case $ALPHA_CPU_TYPE in "EV4 (21064)") UNAME_MACHINE=alpha ;; "EV4.5 (21064)") @@ -326,117 +366,121 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; + OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + GUESS=$UNAME_MACHINE-dec-osf$OSF_REL + ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; + GUESS=m68k-unknown-sysv4 + ;; *:[Aa]miga[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-amigaos - exit ;; + GUESS=$UNAME_MACHINE-unknown-amigaos + ;; *:[Mm]orph[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-morphos - exit ;; + GUESS=$UNAME_MACHINE-unknown-morphos + ;; *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; + GUESS=i370-ibm-openedition + ;; *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; + GUESS=s390-ibm-zvmoe + ;; *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; + GUESS=powerpc-ibm-os400 + ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix"$UNAME_RELEASE" - exit ;; + GUESS=arm-acorn-riscix$UNAME_RELEASE + ;; arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + GUESS=arm-unknown-riscos + ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; + GUESS=hppa1.1-hitachi-hiuxmpp + ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; + case `(/bin/universe) 2>/dev/null` in + att) GUESS=pyramid-pyramid-sysv3 ;; + *) GUESS=pyramid-pyramid-bsd ;; + esac + ;; NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; + GUESS=pyramid-pyramid-svr4 + ;; DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; + GUESS=sparc-icl-nx6 + ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; + sparc) GUESS=sparc-icl-nx7 ;; + esac + ;; s390x:SunOS:*:*) - echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL + ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-hal-solaris2$SUN_REL + ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris2$SUN_REL + ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux"$UNAME_RELEASE" - exit ;; + GUESS=i386-pc-auroraux$UNAME_RELEASE + ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval "$set_cc_for_build" + set_cc_for_build SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then SUN_ARCH=x86_64 fi fi - echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$SUN_ARCH-pc-solaris2$SUN_REL + ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris3$SUN_REL + ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in + case `/usr/bin/arch -k` in Series*|S4*) UNAME_RELEASE=`uname -v` ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` + GUESS=sparc-sun-sunos$SUN_REL + ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos"$UNAME_RELEASE" - exit ;; + GUESS=m68k-sun-sunos$UNAME_RELEASE + ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in + case `/bin/arch` in sun3) - echo m68k-sun-sunos"$UNAME_RELEASE" + GUESS=m68k-sun-sunos$UNAME_RELEASE ;; sun4) - echo sparc-sun-sunos"$UNAME_RELEASE" + GUESS=sparc-sun-sunos$UNAME_RELEASE ;; esac - exit ;; + ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos"$UNAME_RELEASE" - exit ;; + GUESS=sparc-auspex-sunos$UNAME_RELEASE + ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -446,43 +490,43 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-milan-mint$UNAME_RELEASE + ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-hades-mint$UNAME_RELEASE + ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-unknown-mint$UNAME_RELEASE + ;; m68k:machten:*:*) - echo m68k-apple-machten"$UNAME_RELEASE" - exit ;; + GUESS=m68k-apple-machten$UNAME_RELEASE + ;; powerpc:machten:*:*) - echo powerpc-apple-machten"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-apple-machten$UNAME_RELEASE + ;; RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; + GUESS=mips-dec-mach_bsd4.3 + ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix"$UNAME_RELEASE" - exit ;; + GUESS=mips-dec-ultrix$UNAME_RELEASE + ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix"$UNAME_RELEASE" - exit ;; + GUESS=vax-dec-ultrix$UNAME_RELEASE + ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix"$UNAME_RELEASE" - exit ;; + GUESS=clipper-intergraph-clix$UNAME_RELEASE + ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ @@ -508,78 +552,79 @@ EOF dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos"$UNAME_RELEASE" - exit ;; + GUESS=mips-mips-riscos$UNAME_RELEASE + ;; Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; + GUESS=powerpc-motorola-powermax + ;; Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; + GUESS=powerpc-harris-powerunix + ;; m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; + GUESS=m88k-harris-cxux7 + ;; m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; + GUESS=m88k-motorola-sysv4 + ;; m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then - if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ - [ "$TARGET_BINARY_INTERFACE"x = x ] + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x then - echo m88k-dg-dgux"$UNAME_RELEASE" + GUESS=m88k-dg-dgux$UNAME_RELEASE else - echo m88k-dg-dguxbcs"$UNAME_RELEASE" + GUESS=m88k-dg-dguxbcs$UNAME_RELEASE fi else - echo i586-dg-dgux"$UNAME_RELEASE" + GUESS=i586-dg-dgux$UNAME_RELEASE fi - exit ;; + ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; + GUESS=m88k-dolphin-sysv3 + ;; M88*:*:R3*:*) # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; + GUESS=m88k-tektronix-sysv3 + ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; + GUESS=m68k-tektronix-bsd + ;; *:IRIX*:*:*) - echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" - exit ;; + IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'` + GUESS=mips-sgi-irix$IRIX_REL + ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id + ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; + GUESS=i386-ibm-aix + ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then + if test -x /usr/bin/oslevel ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" - exit ;; + GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV + ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #include @@ -593,16 +638,16 @@ EOF EOF if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then - echo "$SYSTEM_NAME" + GUESS=$SYSTEM_NAME else - echo rs6000-ibm-aix3.2.5 + GUESS=rs6000-ibm-aix3.2.5 fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 + GUESS=rs6000-ibm-aix3.2.4 else - echo rs6000-ibm-aix3.2 + GUESS=rs6000-ibm-aix3.2 fi - exit ;; + ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then @@ -610,57 +655,57 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/lslpp ] ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + if test -x /usr/bin/lslpp ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo "$IBM_ARCH"-ibm-aix"$IBM_REV" - exit ;; + GUESS=$IBM_ARCH-ibm-aix$IBM_REV + ;; *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; + GUESS=rs6000-ibm-aix + ;; ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) - echo romp-ibm-bsd4.4 - exit ;; + GUESS=romp-ibm-bsd4.4 + ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to + ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; + GUESS=rs6000-bull-bosx + ;; DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; + GUESS=m68k-bull-sysv3 + ;; 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; + GUESS=m68k-hp-bsd + ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; + GUESS=m68k-hp-bsd4.4 + ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - case "$UNAME_MACHINE" in + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + case $UNAME_MACHINE in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then + if test -x /usr/bin/getconf; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "$sc_cpu_version" in + case $sc_cpu_version in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "$sc_kernel_bits" in + case $sc_kernel_bits in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "$HP_ARCH" = "" ]; then - eval "$set_cc_for_build" + if test "$HP_ARCH" = ""; then + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE @@ -698,9 +743,9 @@ EOF test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ "$HP_ARCH" = hppa2.0w ] + if test "$HP_ARCH" = hppa2.0w then - eval "$set_cc_for_build" + set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -719,14 +764,14 @@ EOF HP_ARCH=hppa64 fi fi - echo "$HP_ARCH"-hp-hpux"$HPUX_REV" - exit ;; + GUESS=$HP_ARCH-hp-hpux$HPUX_REV + ;; ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux"$HPUX_REV" - exit ;; + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + GUESS=ia64-hp-hpux$HPUX_REV + ;; 3050*:HI-UX:*:*) - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #include int @@ -754,36 +799,36 @@ EOF EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; + GUESS=unknown-hitachi-hiuxwe2 + ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) - echo hppa1.1-hp-bsd - exit ;; + GUESS=hppa1.1-hp-bsd + ;; 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; + GUESS=hppa1.0-hp-bsd + ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; + GUESS=hppa1.0-hp-mpeix + ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) - echo hppa1.1-hp-osf - exit ;; + GUESS=hppa1.1-hp-osf + ;; hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; + GUESS=hppa1.0-hp-osf + ;; i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo "$UNAME_MACHINE"-unknown-osf1mk + if test -x /usr/sbin/sysversion ; then + GUESS=$UNAME_MACHINE-unknown-osf1mk else - echo "$UNAME_MACHINE"-unknown-osf1 + GUESS=$UNAME_MACHINE-unknown-osf1 fi - exit ;; + ;; parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; + GUESS=hppa1.1-hp-lites + ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; + GUESS=c1-convex-bsd + ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd @@ -791,17 +836,18 @@ EOF fi exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; + GUESS=c34-convex-bsd + ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; + GUESS=c38-convex-bsd + ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; + GUESS=c4-convex-bsd + ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=ymp-cray-unicos$CRAY_REL + ;; CRAY*[A-Z]90:*:*:*) echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ @@ -809,103 +855,129 @@ EOF -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=t90-cray-unicos$CRAY_REL + ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=alphaev5-cray-unicosmk$CRAY_REL + ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=sv1-cray-unicos$CRAY_REL + ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=craynv-cray-unicosmp$CRAY_REL + ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE + ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=sparc-unknown-bsdi$UNAME_RELEASE + ;; *:BSD/OS:*:*) - echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE + ;; + arm:FreeBSD:*:*) + UNAME_PROCESSOR=`uname -p` + set_cc_for_build + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi + else + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf + fi + ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case "$UNAME_PROCESSOR" in + case $UNAME_PROCESSOR in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL + ;; i*:CYGWIN*:*) - echo "$UNAME_MACHINE"-pc-cygwin - exit ;; + GUESS=$UNAME_MACHINE-pc-cygwin + ;; *:MINGW64*:*) - echo "$UNAME_MACHINE"-pc-mingw64 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw64 + ;; *:MINGW*:*) - echo "$UNAME_MACHINE"-pc-mingw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw32 + ;; *:MSYS*:*) - echo "$UNAME_MACHINE"-pc-msys - exit ;; + GUESS=$UNAME_MACHINE-pc-msys + ;; i*:PW*:*) - echo "$UNAME_MACHINE"-pc-pw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-pw32 + ;; + *:SerenityOS:*:*) + GUESS=$UNAME_MACHINE-pc-serenity + ;; *:Interix*:*) - case "$UNAME_MACHINE" in + case $UNAME_MACHINE in x86) - echo i586-pc-interix"$UNAME_RELEASE" - exit ;; + GUESS=i586-pc-interix$UNAME_RELEASE + ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix"$UNAME_RELEASE" - exit ;; + GUESS=x86_64-unknown-interix$UNAME_RELEASE + ;; IA64) - echo ia64-unknown-interix"$UNAME_RELEASE" - exit ;; + GUESS=ia64-unknown-interix$UNAME_RELEASE + ;; esac ;; i*:UWIN*:*) - echo "$UNAME_MACHINE"-pc-uwin - exit ;; + GUESS=$UNAME_MACHINE-pc-uwin + ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; + GUESS=x86_64-pc-cygwin + ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=powerpcle-unknown-solaris2$SUN_REL + ;; *:GNU:*:*) # the GNU system - echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" - exit ;; + GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` + GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL + ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" - exit ;; - i*86:Minix:*:*) - echo "$UNAME_MACHINE"-pc-minix - exit ;; + GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC + ;; + *:Minix:*:*) + GUESS=$UNAME_MACHINE-unknown-minix + ;; aarch64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -916,187 +988,225 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; arm*:Linux:*:*) - eval "$set_cc_for_build" + set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi else - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf fi fi - exit ;; + ;; avr32*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; cris:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; crisv32:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; e2k:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; frv:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; hexagon:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-pc-linux-$LIBC + ;; ia64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; k1om:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m32r*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m68*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; mips:Linux:*:* | mips64:Linux:*:*) - eval "$set_cc_for_build" + set_cc_for_build + IS_GLIBC=0 + test x"${LIBC}" = xgnu && IS_GLIBC=1 sed 's/^ //' << EOF > "$dummy.c" #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el + #undef mips + #undef mipsel + #undef mips64 + #undef mips64el + #if ${IS_GLIBC} && defined(_ABI64) + LIBCABI=gnuabi64 + #else + #if ${IS_GLIBC} && defined(_ABIN32) + LIBCABI=gnuabin32 + #else + LIBCABI=${LIBC} + #endif + #endif + + #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa64r6 + #else + #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa32r6 + #else + #if defined(__mips64) + CPU=mips64 + #else + CPU=mips + #endif + #endif + #endif + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el + MIPS_ENDIAN=el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} + MIPS_ENDIAN= #else - CPU= + MIPS_ENDIAN= #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" - test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } + cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'` + eval "$cc_set_vars" + test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-"$LIBC" - exit ;; + GUESS=or1k-unknown-linux-$LIBC + ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; padre:Linux:*:*) - echo sparc-unknown-linux-"$LIBC" - exit ;; + GUESS=sparc-unknown-linux-$LIBC + ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-"$LIBC" - exit ;; + GUESS=hppa64-unknown-linux-$LIBC + ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; - PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; - *) echo hppa-unknown-linux-"$LIBC" ;; + PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; + PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; + *) GUESS=hppa-unknown-linux-$LIBC ;; esac - exit ;; + ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc64-unknown-linux-$LIBC + ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc-unknown-linux-$LIBC + ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc64le-unknown-linux-$LIBC + ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-"$LIBC" - exit ;; - riscv32:Linux:*:* | riscv64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpcle-unknown-linux-$LIBC + ;; + riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; s390:Linux:*:* | s390x:Linux:*:*) - echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-ibm-linux-$LIBC + ;; sh64*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sh*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; tile*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; vax:Linux:*:*) - echo "$UNAME_MACHINE"-dec-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-dec-linux-$LIBC + ;; x86_64:Linux:*:*) - if objdump -f /bin/sh | grep -q elf32-x86-64; then - echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 - else - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + set_cc_for_build + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_X32 >/dev/null + then + LIBCABI=${LIBC}x32 + fi fi - exit ;; + GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI + ;; xtensa*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; + GUESS=i386-sequent-sysv4 + ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" - exit ;; + GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION + ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo "$UNAME_MACHINE"-pc-os2-emx - exit ;; + GUESS=$UNAME_MACHINE-pc-os2-emx + ;; i*86:XTS-300:*:STOP) - echo "$UNAME_MACHINE"-unknown-stop - exit ;; + GUESS=$UNAME_MACHINE-unknown-stop + ;; i*86:atheos:*:*) - echo "$UNAME_MACHINE"-unknown-atheos - exit ;; + GUESS=$UNAME_MACHINE-unknown-atheos + ;; i*86:syllable:*:*) - echo "$UNAME_MACHINE"-pc-syllable - exit ;; + GUESS=$UNAME_MACHINE-pc-syllable + ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=i386-unknown-lynxos$UNAME_RELEASE + ;; i*86:*DOS:*:*) - echo "$UNAME_MACHINE"-pc-msdosdjgpp - exit ;; + GUESS=$UNAME_MACHINE-pc-msdosdjgpp + ;; i*86:*:4.*:*) UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" + GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL else - echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" + GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL fi - exit ;; + ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in @@ -1104,12 +1214,12 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" - exit ;; + GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1119,11 +1229,11 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" + GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL else - echo "$UNAME_MACHINE"-pc-sysv32 + GUESS=$UNAME_MACHINE-pc-sysv32 fi - exit ;; + ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -1131,31 +1241,31 @@ EOF # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; + GUESS=i586-pc-msdosdjgpp + ;; Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; + GUESS=i386-pc-mach3 + ;; paragon:*:*:*) - echo i860-intel-osf1 - exit ;; + GUESS=i860-intel-osf1 + ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 + GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 + GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 fi - exit ;; + ;; mini*:CTIX:SYS*5:*) # "miniframe" - echo m68010-convergent-sysv - exit ;; + GUESS=m68010-convergent-sysv + ;; mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; + GUESS=m68k-convergent-sysv + ;; M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; + GUESS=m68k-diab-dnix + ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) @@ -1180,249 +1290,404 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=m68k-unknown-lynxos$UNAME_RELEASE + ;; mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; + GUESS=m68k-atari-sysv4 + ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=sparc-unknown-lynxos$UNAME_RELEASE + ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=rs6000-unknown-lynxos$UNAME_RELEASE + ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-unknown-lynxos$UNAME_RELEASE + ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv"$UNAME_RELEASE" - exit ;; + GUESS=mips-dde-sysv$UNAME_RELEASE + ;; RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo "$UNAME_MACHINE"-sni-sysv4 + GUESS=$UNAME_MACHINE-sni-sysv4 else - echo ns32k-sni-sysv + GUESS=ns32k-sni-sysv fi - exit ;; + ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says - echo i586-unisys-sysv4 - exit ;; + GUESS=i586-unisys-sysv4 + ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; + GUESS=hppa1.1-stratus-sysv4 + ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; + GUESS=i860-stratus-sysv4 + ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo "$UNAME_MACHINE"-stratus-vos - exit ;; + GUESS=$UNAME_MACHINE-stratus-vos + ;; *:VOS:*:*) # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; + GUESS=hppa1.1-stratus-vos + ;; mc68*:A/UX:*:*) - echo m68k-apple-aux"$UNAME_RELEASE" - exit ;; + GUESS=m68k-apple-aux$UNAME_RELEASE + ;; news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; + GUESS=mips-sony-newsos6 + ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv"$UNAME_RELEASE" + if test -d /usr/nec; then + GUESS=mips-nec-sysv$UNAME_RELEASE else - echo mips-unknown-sysv"$UNAME_RELEASE" + GUESS=mips-unknown-sysv$UNAME_RELEASE fi - exit ;; + ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; + GUESS=powerpc-be-beos + ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; + GUESS=powerpc-apple-beos + ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; + GUESS=i586-pc-beos + ;; BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; + GUESS=i586-pc-haiku + ;; x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; + GUESS=x86_64-unknown-haiku + ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx4-nec-superux$UNAME_RELEASE + ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx5-nec-superux$UNAME_RELEASE + ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx6-nec-superux$UNAME_RELEASE + ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx7-nec-superux$UNAME_RELEASE + ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx8-nec-superux$UNAME_RELEASE + ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx8r-nec-superux$UNAME_RELEASE + ;; SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sxace-nec-superux$UNAME_RELEASE + ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-apple-rhapsody$UNAME_RELEASE + ;; *:Rhapsody:*:*) - echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE + ;; + arm64:Darwin:*:*) + GUESS=aarch64-apple-darwin$UNAME_RELEASE + ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval "$set_cc_for_build" - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc + UNAME_PROCESSOR=`uname -p` + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + if command -v xcode-select > /dev/null 2> /dev/null && \ + ! xcode-select --print-path > /dev/null 2> /dev/null ; then + # Avoid executing cc if there is no toolchain installed as + # cc will be a stub that puts up a graphical alert + # prompting the user to install developer tools. + CC_FOR_BUILD=no_compiler_found + else + set_cc_for_build fi - if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null - then - UNAME_PROCESSOR=powerpc - fi + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc fi elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 + # uname -m returns i386 or x86_64 + UNAME_PROCESSOR=$UNAME_MACHINE fi - echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE + ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE + ;; *:QNX:*:4*) - echo i386-pc-qnx - exit ;; + GUESS=i386-pc-qnx + ;; NEO-*:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=neo-tandem-nsk$UNAME_RELEASE + ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nse-tandem-nsk$UNAME_RELEASE + ;; NSR-*:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsr-tandem-nsk$UNAME_RELEASE + ;; NSV-*:NONSTOP_KERNEL:*:*) - echo nsv-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsv-tandem-nsk$UNAME_RELEASE + ;; NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsx-tandem-nsk$UNAME_RELEASE + ;; *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; + GUESS=mips-compaq-nonstopux + ;; BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; + GUESS=bs2000-siemens-sysv + ;; DS/*:UNIX_System_V:*:*) - echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE + ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = 386; then + if test "${cputype-}" = 386; then UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" + elif test "x${cputype-}" != x; then + UNAME_MACHINE=$cputype fi - echo "$UNAME_MACHINE"-unknown-plan9 - exit ;; + GUESS=$UNAME_MACHINE-unknown-plan9 + ;; *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; + GUESS=pdp10-unknown-tops10 + ;; *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; + GUESS=pdp10-unknown-tenex + ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; + GUESS=pdp10-dec-tops20 + ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; + GUESS=pdp10-xkl-tops20 + ;; *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; + GUESS=pdp10-unknown-tops20 + ;; *:ITS:*:*) - echo pdp10-unknown-its - exit ;; + GUESS=pdp10-unknown-its + ;; SEI:*:*:SEIUX) - echo mips-sei-seiux"$UNAME_RELEASE" - exit ;; + GUESS=mips-sei-seiux$UNAME_RELEASE + ;; *:DragonFly:*:*) - echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; + DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL + ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "$UNAME_MACHINE" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; + case $UNAME_MACHINE in + A*) GUESS=alpha-dec-vms ;; + I*) GUESS=ia64-dec-vms ;; + V*) GUESS=vax-dec-vms ;; esac ;; *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; + GUESS=i386-pc-xenix + ;; i*86:skyos:*:*) - echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" - exit ;; + SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'` + GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL + ;; i*86:rdos:*:*) - echo "$UNAME_MACHINE"-pc-rdos - exit ;; - i*86:AROS:*:*) - echo "$UNAME_MACHINE"-pc-aros - exit ;; + GUESS=$UNAME_MACHINE-pc-rdos + ;; + i*86:Fiwix:*:*) + GUESS=$UNAME_MACHINE-pc-fiwix + ;; + *:AROS:*:*) + GUESS=$UNAME_MACHINE-unknown-aros + ;; x86_64:VMkernel:*:*) - echo "$UNAME_MACHINE"-unknown-esx - exit ;; + GUESS=$UNAME_MACHINE-unknown-esx + ;; amd64:Isilon\ OneFS:*:*) - echo x86_64-unknown-onefs - exit ;; + GUESS=x86_64-unknown-onefs + ;; + *:Unleashed:*:*) + GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE + ;; esac +# Do we have a guess based on uname results? +if test "x$GUESS" != x; then + echo "$GUESS" + exit +fi + +# No uname command or uname output not recognized. +set_cc_for_build +cat > "$dummy.c" < +#include +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#include +#if defined(_SIZE_T_) || defined(SIGLOST) +#include +#endif +#endif +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); +#endif + +#if defined (vax) +#if !defined (ultrix) +#include +#if defined (BSD) +#if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +#else +#if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#endif +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#else +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname un; + uname (&un); + printf ("vax-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("vax-dec-ultrix\n"); exit (0); +#endif +#endif +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname *un; + uname (&un); + printf ("mips-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("mips-dec-ultrix\n"); exit (0); +#endif +#endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. +test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } + echo "$0: unable to guess system type" >&2 -case "$UNAME_MACHINE:$UNAME_SYSTEM" in +case $UNAME_MACHINE:$UNAME_SYSTEM in mips:Linux | mips64:Linux) # If we got here on MIPS GNU/Linux, output extra information. cat >&2 <&2 < header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H @@ -216,7 +219,9 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS /* Version number of package */ diff --git a/config.sub b/config.sub index 1d8e98bcee..dba16e84c7 100755 --- a/config.sub +++ b/config.sub @@ -1,12 +1,14 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2018 Free Software Foundation, Inc. +# Copyright 1992-2022 Free Software Foundation, Inc. -timestamp='2018-02-22' +# shellcheck disable=SC2006,SC2268 # see below for rationale + +timestamp='2022-01-03' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -33,7 +35,7 @@ timestamp='2018-02-22' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -50,6 +52,13 @@ timestamp='2018-02-22' # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + me=`echo "$0" | sed -e 's,.*/,,'` usage="\ @@ -67,7 +76,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2018 Free Software Foundation, Inc. +Copyright 1992-2022 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -89,7 +98,7 @@ while test $# -gt 0 ; do - ) # Use stdin as input. break ;; -* ) - echo "$me: invalid option $1$help" + echo "$me: invalid option $1$help" >&2 exit 1 ;; *local*) @@ -110,1223 +119,1186 @@ case $# in exit 1;; esac -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | cloudabi*-eabi* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo "$1" | sed 's/-[^-]*$//'` - if [ "$basic_machine" != "$1" ] - then os=`echo "$1" | sed 's/.*-/-/'` - else os=; fi - ;; -esac +# Split fields of configuration type +# shellcheck disable=SC2162 +saved_IFS=$IFS +IFS="-" read field1 field2 field3 field4 <&2 + exit 1 ;; - -lynx*) - os=-lynxos + *-*-*-*) + basic_machine=$field1-$field2 + basic_os=$field3-$field4 ;; - -ptx*) - basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` + *-*-*) + # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two + # parts + maybe_os=$field2-$field3 + case $maybe_os in + nto-qnx* | linux-* | uclinux-uclibc* \ + | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ + | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ + | storm-chaos* | os2-emx* | rtmk-nova*) + basic_machine=$field1 + basic_os=$maybe_os + ;; + android-linux) + basic_machine=$field1-unknown + basic_os=linux-android + ;; + *) + basic_machine=$field1-$field2 + basic_os=$field3 + ;; + esac ;; - -psos*) - os=-psos + *-*) + # A lone config we happen to match not fitting any pattern + case $field1-$field2 in + decstation-3100) + basic_machine=mips-dec + basic_os= + ;; + *-*) + # Second component is usually, but not always the OS + case $field2 in + # Prevent following clause from handling this valid os + sun*os*) + basic_machine=$field1 + basic_os=$field2 + ;; + zephyr*) + basic_machine=$field1-unknown + basic_os=$field2 + ;; + # Manufacturers + dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ + | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ + | unicom* | ibm* | next | hp | isi* | apollo | altos* \ + | convergent* | ncr* | news | 32* | 3600* | 3100* \ + | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ + | ultra | tti* | harris | dolphin | highlevel | gould \ + | cbm | ns | masscomp | apple | axis | knuth | cray \ + | microblaze* | sim | cisco \ + | oki | wec | wrs | winbond) + basic_machine=$field1-$field2 + basic_os= + ;; + *) + basic_machine=$field1 + basic_os=$field2 + ;; + esac + ;; + esac ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint + *) + # Convert single-component short-hands not valid as part of + # multi-component configurations. + case $field1 in + 386bsd) + basic_machine=i386-pc + basic_os=bsd + ;; + a29khif) + basic_machine=a29k-amd + basic_os=udi + ;; + adobe68k) + basic_machine=m68010-adobe + basic_os=scout + ;; + alliant) + basic_machine=fx80-alliant + basic_os= + ;; + altos | altos3068) + basic_machine=m68k-altos + basic_os= + ;; + am29k) + basic_machine=a29k-none + basic_os=bsd + ;; + amdahl) + basic_machine=580-amdahl + basic_os=sysv + ;; + amiga) + basic_machine=m68k-unknown + basic_os= + ;; + amigaos | amigados) + basic_machine=m68k-unknown + basic_os=amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + basic_os=sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + basic_os=sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + basic_os=bsd + ;; + aros) + basic_machine=i386-pc + basic_os=aros + ;; + aux) + basic_machine=m68k-apple + basic_os=aux + ;; + balance) + basic_machine=ns32k-sequent + basic_os=dynix + ;; + blackfin) + basic_machine=bfin-unknown + basic_os=linux + ;; + cegcc) + basic_machine=arm-unknown + basic_os=cegcc + ;; + convex-c1) + basic_machine=c1-convex + basic_os=bsd + ;; + convex-c2) + basic_machine=c2-convex + basic_os=bsd + ;; + convex-c32) + basic_machine=c32-convex + basic_os=bsd + ;; + convex-c34) + basic_machine=c34-convex + basic_os=bsd + ;; + convex-c38) + basic_machine=c38-convex + basic_os=bsd + ;; + cray) + basic_machine=j90-cray + basic_os=unicos + ;; + crds | unos) + basic_machine=m68k-crds + basic_os= + ;; + da30) + basic_machine=m68k-da30 + basic_os= + ;; + decstation | pmax | pmin | dec3100 | decstatn) + basic_machine=mips-dec + basic_os= + ;; + delta88) + basic_machine=m88k-motorola + basic_os=sysv3 + ;; + dicos) + basic_machine=i686-pc + basic_os=dicos + ;; + djgpp) + basic_machine=i586-pc + basic_os=msdosdjgpp + ;; + ebmon29k) + basic_machine=a29k-amd + basic_os=ebmon + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + basic_os=ose + ;; + gmicro) + basic_machine=tron-gmicro + basic_os=sysv + ;; + go32) + basic_machine=i386-pc + basic_os=go32 + ;; + h8300hms) + basic_machine=h8300-hitachi + basic_os=hms + ;; + h8300xray) + basic_machine=h8300-hitachi + basic_os=xray + ;; + h8500hms) + basic_machine=h8500-hitachi + basic_os=hms + ;; + harris) + basic_machine=m88k-harris + basic_os=sysv3 + ;; + hp300 | hp300hpux) + basic_machine=m68k-hp + basic_os=hpux + ;; + hp300bsd) + basic_machine=m68k-hp + basic_os=bsd + ;; + hppaosf) + basic_machine=hppa1.1-hp + basic_os=osf + ;; + hppro) + basic_machine=hppa1.1-hp + basic_os=proelf + ;; + i386mach) + basic_machine=i386-mach + basic_os=mach + ;; + isi68 | isi) + basic_machine=m68k-isi + basic_os=sysv + ;; + m68knommu) + basic_machine=m68k-unknown + basic_os=linux + ;; + magnum | m3230) + basic_machine=mips-mips + basic_os=sysv + ;; + merlin) + basic_machine=ns32k-utek + basic_os=sysv + ;; + mingw64) + basic_machine=x86_64-pc + basic_os=mingw64 + ;; + mingw32) + basic_machine=i686-pc + basic_os=mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + basic_os=mingw32ce + ;; + monitor) + basic_machine=m68k-rom68k + basic_os=coff + ;; + morphos) + basic_machine=powerpc-unknown + basic_os=morphos + ;; + moxiebox) + basic_machine=moxie-unknown + basic_os=moxiebox + ;; + msdos) + basic_machine=i386-pc + basic_os=msdos + ;; + msys) + basic_machine=i686-pc + basic_os=msys + ;; + mvs) + basic_machine=i370-ibm + basic_os=mvs + ;; + nacl) + basic_machine=le32-unknown + basic_os=nacl + ;; + ncr3000) + basic_machine=i486-ncr + basic_os=sysv4 + ;; + netbsd386) + basic_machine=i386-pc + basic_os=netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + basic_os=linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + basic_os=newsos + ;; + news1000) + basic_machine=m68030-sony + basic_os=newsos + ;; + necv70) + basic_machine=v70-nec + basic_os=sysv + ;; + nh3000) + basic_machine=m68k-harris + basic_os=cxux + ;; + nh[45]000) + basic_machine=m88k-harris + basic_os=cxux + ;; + nindy960) + basic_machine=i960-intel + basic_os=nindy + ;; + mon960) + basic_machine=i960-intel + basic_os=mon960 + ;; + nonstopux) + basic_machine=mips-compaq + basic_os=nonstopux + ;; + os400) + basic_machine=powerpc-ibm + basic_os=os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + basic_os=ose + ;; + os68k) + basic_machine=m68k-none + basic_os=os68k + ;; + paragon) + basic_machine=i860-intel + basic_os=osf + ;; + parisc) + basic_machine=hppa-unknown + basic_os=linux + ;; + psp) + basic_machine=mipsallegrexel-sony + basic_os=psp + ;; + pw32) + basic_machine=i586-unknown + basic_os=pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + basic_os=rdos + ;; + rdos32) + basic_machine=i386-pc + basic_os=rdos + ;; + rom68k) + basic_machine=m68k-rom68k + basic_os=coff + ;; + sa29200) + basic_machine=a29k-amd + basic_os=udi + ;; + sei) + basic_machine=mips-sei + basic_os=seiux + ;; + sequent) + basic_machine=i386-sequent + basic_os= + ;; + sps7) + basic_machine=m68k-bull + basic_os=sysv2 + ;; + st2000) + basic_machine=m68k-tandem + basic_os= + ;; + stratus) + basic_machine=i860-stratus + basic_os=sysv4 + ;; + sun2) + basic_machine=m68000-sun + basic_os= + ;; + sun2os3) + basic_machine=m68000-sun + basic_os=sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + basic_os=sunos4 + ;; + sun3) + basic_machine=m68k-sun + basic_os= + ;; + sun3os3) + basic_machine=m68k-sun + basic_os=sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + basic_os=sunos4 + ;; + sun4) + basic_machine=sparc-sun + basic_os= + ;; + sun4os3) + basic_machine=sparc-sun + basic_os=sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + basic_os=sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + basic_os=solaris2 + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + basic_os= + ;; + sv1) + basic_machine=sv1-cray + basic_os=unicos + ;; + symmetry) + basic_machine=i386-sequent + basic_os=dynix + ;; + t3e) + basic_machine=alphaev5-cray + basic_os=unicos + ;; + t90) + basic_machine=t90-cray + basic_os=unicos + ;; + toad1) + basic_machine=pdp10-xkl + basic_os=tops20 + ;; + tpf) + basic_machine=s390x-ibm + basic_os=tpf + ;; + udi29k) + basic_machine=a29k-amd + basic_os=udi + ;; + ultra3) + basic_machine=a29k-nyu + basic_os=sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + basic_os=none + ;; + vaxv) + basic_machine=vax-dec + basic_os=sysv + ;; + vms) + basic_machine=vax-dec + basic_os=vms + ;; + vsta) + basic_machine=i386-pc + basic_os=vsta + ;; + vxworks960) + basic_machine=i960-wrs + basic_os=vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + basic_os=vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + basic_os=vxworks + ;; + xbox) + basic_machine=i686-pc + basic_os=mingw32 + ;; + ymp) + basic_machine=ymp-cray + basic_os=unicos + ;; + *) + basic_machine=$1 + basic_os= + ;; + esac ;; esac -# Decode aliases for certain CPU-COMPANY combinations. +# Decode 1-component or ad-hoc basic machines case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | ba \ - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | e2k | epiphany \ - | fido | fr30 | frv | ft32 \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia16 | ia64 \ - | ip2k | iq2000 \ - | k1om \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ - | pdp10 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pru \ - | pyramid \ - | riscv32 | riscv64 \ - | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | visium \ - | wasm32 \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - leon|leon[3-9]) - basic_machine=sparc-$basic_machine - ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none + # Here we handle the default manufacturer of certain CPU types. It is in + # some cases the only manufacturer, in others, it is the most popular. + w89k) + cpu=hppa1.1 + vendor=winbond ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) + op50n) + cpu=hppa1.1 + vendor=oki ;; - ms1) - basic_machine=mt-unknown + op60c) + cpu=hppa1.1 + vendor=oki ;; - - strongarm | thumb | xscale) - basic_machine=arm-unknown + ibm*) + cpu=i370 + vendor=ibm ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none + orion105) + cpu=clipper + vendor=highlevel ;; - xscaleeb) - basic_machine=armeb-unknown + mac | mpw | mac-mpw) + cpu=m68k + vendor=apple ;; - - xscaleel) - basic_machine=armel-unknown + pmac | pmac-mpw) + cpu=powerpc + vendor=apple ;; - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | ba-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | e2k-* | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ - | ip2k-* | iq2000-* \ - | k1om-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | or1k*-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pru-* \ - | pyramid-* \ - | riscv32-* | riscv64-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | visium-* \ - | wasm32-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-pc - os=-bsd - ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att + cpu=m68000 + vendor=att ;; 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - asmjs) - basic_machine=asmjs-unknown - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + cpu=we32k + vendor=att ;; bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec + cpu=powerpc + vendor=ibm + basic_os=cnk ;; decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 + cpu=pdp10 + vendor=dec + basic_os=tops10 ;; decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 + cpu=pdp10 + vendor=dec + basic_os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx + cpu=m68k + vendor=motorola ;; dpx2*) - basic_machine=m68k-bull - os=-sysv3 - ;; - e500v[12]) - basic_machine=powerpc-unknown - os=$os"spe" - ;; - e500v[12]-*) - basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=$os"spe" - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd + cpu=m68k + vendor=bull + basic_os=sysv3 ;; encore | umax | mmax) - basic_machine=ns32k-encore + cpu=ns32k + vendor=encore ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose + elxsi) + cpu=elxsi + vendor=elxsi + basic_os=${basic_os:-bsd} ;; fx2800) - basic_machine=i860-alliant + cpu=i860 + vendor=alliant ;; genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 + cpu=ns32k + vendor=ns ;; h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp + cpu=m68000 + vendor=hp ;; hp9k3[2-9][0-9]) - basic_machine=m68k-hp + cpu=m68k + vendor=hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm + cpu=hppa1.0 + vendor=hp ;; i*86v32) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv32 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv32 ;; i*86v4*) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv4 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv4 ;; i*86v) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv ;; i*86sol2) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=solaris2 ;; - vsta) - basic_machine=i386-unknown - os=-vsta + j90 | j90-cray) + cpu=j90 + vendor=cray + basic_os=${basic_os:-unicos} ;; iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) + cpu=mips + vendor=sgi + case $basic_os in + irix*) ;; *) - os=-irix4 + basic_os=irix4 ;; esac ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - leon-*|leon[3-9]-*) - basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox + cpu=m68000 + vendor=convergent ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i686-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) + cpu=m68k + vendor=atari + basic_os=mint ;; news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv + cpu=mips + vendor=sony + basic_os=newsos ;; next | m*-next) - basic_machine=m68k-next - case $os in - -nextstep* ) + cpu=m68k + vendor=next + case $basic_os in + openstep*) + ;; + nextstep*) ;; - -ns2*) - os=-nextstep2 + ns2*) + basic_os=nextstep2 ;; *) - os=-nextstep3 + basic_os=nextstep3 ;; esac ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - nsv-tandem) - basic_machine=nsv-tandem - ;; - nsx-tandem) - basic_machine=nsx-tandem + cpu=np1 + vendor=gould ;; op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k + cpu=hppa1.1 + vendor=oki + basic_os=proelf ;; pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 ;; pbd) - basic_machine=sparc-tti + cpu=sparc + vendor=tti ;; pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc + cpu=m68k + vendor=tti ;; - pc98-*) - basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` + pc532) + cpu=ns32k + vendor=pc532 ;; pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc | ppcbe) basic_machine=powerpc-unknown + cpu=pn + vendor=gould ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle) - basic_machine=powerpcle-unknown + power) + cpu=power + vendor=ibm ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ps2) + cpu=i386 + vendor=ibm ;; - ppc64) basic_machine=powerpc64-unknown + rm[46]00) + cpu=mips + vendor=siemens ;; - ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` + rtpc | rtpc-*) + cpu=romp + vendor=ibm ;; - ppc64le | powerpc64little) - basic_machine=powerpc64le-unknown + sde) + cpu=mipsisa32 + vendor=sde + basic_os=${basic_os:-elf} ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` + simso-wrs) + cpu=sparclite + vendor=wrs + basic_os=vxworks ;; - ps2) - basic_machine=i386-ibm + tower | tower-32) + cpu=m68k + vendor=ncr ;; - pw32) - basic_machine=i586-unknown - os=-pw32 + vpp*|vx|vx-*) + cpu=f301 + vendor=fujitsu ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos + w65) + cpu=w65 + vendor=wdc ;; - rdos32) - basic_machine=i386-pc - os=-rdos + w89k-*) + cpu=hppa1.1 + vendor=winbond + basic_os=proelf ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff + none) + cpu=none + vendor=none ;; - rm[46]00) - basic_machine=mips-siemens + leon|leon[3-9]) + cpu=sparc + vendor=$basic_machine ;; - rtpc | rtpc-*) - basic_machine=romp-ibm + leon-*|leon[3-9]-*) + cpu=sparc + vendor=`echo "$basic_machine" | sed 's/-.*//'` ;; - s390 | s390-*) - basic_machine=s390-ibm + + *-*) + # shellcheck disable=SC2162 + saved_IFS=$IFS + IFS="-" read cpu vendor <&2 - exit 1 + # Recognize the canonical CPU types that are allowed with any + # company name. + case $cpu in + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | abacus \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ + | alphapca5[67] | alpha64pca5[67] \ + | am33_2.0 \ + | amdgcn \ + | arc | arceb | arc32 | arc64 \ + | arm | arm[lb]e | arme[lb] | armv* \ + | avr | avr32 \ + | asmjs \ + | ba \ + | be32 | be64 \ + | bfin | bpf | bs2000 \ + | c[123]* | c30 | [cjt]90 | c4x \ + | c8051 | clipper | craynv | csky | cydra \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | elxsi | epiphany \ + | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ + | h8300 | h8500 \ + | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i*86 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | loongarch32 | loongarch64 | loongarchx32 \ + | m32c | m32r | m32rle \ + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64eb | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r3 | mipsisa32r3el \ + | mipsisa32r5 | mipsisa32r5el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r3 | mipsisa64r3el \ + | mipsisa64r5 | mipsisa64r5el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mmix \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nfp \ + | nios | nios2 | nios2eb | nios2el \ + | none | np1 | ns16k | ns32k | nvptx \ + | open8 \ + | or1k* \ + | or32 \ + | orion \ + | picochip \ + | pdp10 | pdp11 | pj | pjl | pn | power \ + | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ + | pru \ + | pyramid \ + | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ + | rl78 | romp | rs6000 | rx \ + | s390 | s390x \ + | score \ + | sh | shl \ + | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ + | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ + | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ + | spu \ + | tahoe \ + | thumbv7* \ + | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ + | tron \ + | ubicom32 \ + | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ + | vax \ + | visium \ + | w65 \ + | wasm32 | wasm64 \ + | we32k \ + | x86 | x86_64 | xc16x | xgate | xps100 \ + | xstormy16 | xtensa* \ + | ymp \ + | z8k | z80) + ;; + + *) + echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 + exit 1 + ;; + esac ;; esac # Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` +case $vendor in + digital*) + vendor=dec ;; - *-commodore*) - basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` + commodore*) + vendor=cbm ;; *) ;; @@ -1334,203 +1306,215 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if [ x"$os" != x"" ] +if test x$basic_os != x then + +# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just +# set os. +case $basic_os in + gnu/linux*) + kernel=linux + os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'` + ;; + os2-emx) + kernel=os2 + os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'` + ;; + nto-qnx*) + kernel=nto + os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'` + ;; + *-*) + # shellcheck disable=SC2162 + saved_IFS=$IFS + IFS="-" read kernel os <&2 - exit 1 + # No normalization, but not necessarily accepted, that comes below. ;; esac + else # Here we handle the default operating systems that come with various machines. @@ -1543,258 +1527,363 @@ else # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -case $basic_machine in +kernel= +case $cpu-$vendor in score-*) - os=-elf + os=elf ;; spu-*) - os=-elf + os=elf ;; *-acorn) - os=-riscix1.2 + os=riscix1.2 ;; arm*-rebel) - os=-linux + kernel=linux + os=gnu ;; arm*-semi) - os=-aout + os=aout ;; c4x-* | tic4x-*) - os=-coff + os=coff ;; c8051-*) - os=-elf + os=elf + ;; + clipper-intergraph) + os=clix ;; hexagon-*) - os=-elf + os=elf ;; tic54x-*) - os=-coff + os=coff ;; tic55x-*) - os=-coff + os=coff ;; tic6x-*) - os=-coff + os=coff ;; # This must come before the *-dec entry. pdp10-*) - os=-tops20 + os=tops20 ;; pdp11-*) - os=-none + os=none ;; *-dec | vax-*) - os=-ultrix4.2 + os=ultrix4.2 ;; m68*-apollo) - os=-domain + os=domain ;; i386-sun) - os=-sunos4.0.2 + os=sunos4.0.2 ;; m68000-sun) - os=-sunos3 + os=sunos3 ;; m68*-cisco) - os=-aout + os=aout ;; mep-*) - os=-elf + os=elf ;; mips*-cisco) - os=-elf + os=elf ;; mips*-*) - os=-elf + os=elf ;; or32-*) - os=-coff + os=coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 + os=sysv3 ;; sparc-* | *-sun) - os=-sunos4.1.1 + os=sunos4.1.1 ;; pru-*) - os=-elf + os=elf ;; *-be) - os=-beos + os=beos ;; *-ibm) - os=-aix + os=aix ;; *-knuth) - os=-mmixware + os=mmixware ;; *-wec) - os=-proelf + os=proelf ;; *-winbond) - os=-proelf + os=proelf ;; *-oki) - os=-proelf + os=proelf ;; *-hp) - os=-hpux + os=hpux ;; *-hitachi) - os=-hiux + os=hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv + os=sysv ;; *-cbm) - os=-amigaos + os=amigaos ;; *-dg) - os=-dgux + os=dgux ;; *-dolphin) - os=-sysv3 + os=sysv3 ;; m68k-ccur) - os=-rtu + os=rtu ;; m88k-omron*) - os=-luna + os=luna ;; *-next) - os=-nextstep + os=nextstep ;; *-sequent) - os=-ptx + os=ptx ;; *-crds) - os=-unos + os=unos ;; *-ns) - os=-genix + os=genix ;; i370-*) - os=-mvs + os=mvs ;; *-gould) - os=-sysv + os=sysv ;; *-highlevel) - os=-bsd + os=bsd ;; *-encore) - os=-bsd + os=bsd ;; *-sgi) - os=-irix + os=irix ;; *-siemens) - os=-sysv4 + os=sysv4 ;; *-masscomp) - os=-rtu + os=rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=-uxpv + os=uxpv ;; *-rom68k) - os=-coff + os=coff ;; *-*bug) - os=-coff + os=coff ;; *-apple) - os=-macos + os=macos ;; *-atari*) - os=-mint + os=mint + ;; + *-wrs) + os=vxworks ;; *) - os=-none + os=none ;; esac + fi +# Now, validate our (potentially fixed-up) OS. +case $os in + # Sometimes we do "kernel-libc", so those need to count as OSes. + musl* | newlib* | relibc* | uclibc*) + ;; + # Likewise for "kernel-abi" + eabi* | gnueabi*) + ;; + # VxWorks passes extra cpu info in the 4th filed. + simlinux | simwindows | spe) + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ + | hiux* | abug | nacl* | netware* | windows* \ + | os9* | macos* | osx* | ios* \ + | mpw* | magic* | mmixware* | mon960* | lnews* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | mirbsd* | netbsd* | dicos* | openedition* | ose* \ + | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \ + | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* | serenity* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | mint* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ + | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ + | fiwix* ) + ;; + # This one is extra strict with allowed versions + sco3.2v2 | sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + none) + ;; + *) + echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os in + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ + | linux-musl* | linux-relibc* | linux-uclibc* ) + ;; + uclinux-uclibc* ) + ;; + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) + # These are just libc implementations, not actual OSes, and thus + # require a kernel. + echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + kfreebsd*-gnu* | kopensolaris*-gnu*) + ;; + vxworks-simlinux | vxworks-simwindows | vxworks-spe) + ;; + nto-qnx*) + ;; + os2-emx) + ;; + *-eabi* | *-gnueabi*) + ;; + -*) + # Blank kernel with real OS is always fine. + ;; + *-*) + echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + exit 1 + ;; +esac + # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) +case $vendor in + unknown) + case $cpu-$os in + *-riscix*) vendor=acorn ;; - -sunos*) + *-sunos*) vendor=sun ;; - -cnk*|-aix*) + *-cnk* | *-aix*) vendor=ibm ;; - -beos*) + *-beos*) vendor=be ;; - -hpux*) + *-hpux*) vendor=hp ;; - -mpeix*) + *-mpeix*) vendor=hp ;; - -hiux*) + *-hiux*) vendor=hitachi ;; - -unos*) + *-unos*) vendor=crds ;; - -dgux*) + *-dgux*) vendor=dg ;; - -luna*) + *-luna*) vendor=omron ;; - -genix*) + *-genix*) vendor=ns ;; - -mvs* | -opened*) + *-clix*) + vendor=intergraph + ;; + *-mvs* | *-opened*) + vendor=ibm + ;; + *-os400*) vendor=ibm ;; - -os400*) + s390-* | s390x-*) vendor=ibm ;; - -ptx*) + *-ptx*) vendor=sequent ;; - -tpf*) + *-tpf*) vendor=ibm ;; - -vxsim* | -vxworks* | -windiss*) + *-vxsim* | *-vxworks* | *-windiss*) vendor=wrs ;; - -aux*) + *-aux*) vendor=apple ;; - -hms*) + *-hms*) vendor=hitachi ;; - -mpw* | -macos*) + *-mpw* | *-macos*) vendor=apple ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) vendor=atari ;; - -vos*) + *-vos*) vendor=stratus ;; esac - basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo "$basic_machine$os" +echo "$cpu-$vendor-${kernel:+$kernel-}$os" exit # Local variables: -# eval: (add-hook 'write-file-functions 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/configure b/configure index a96f888112..0f28b4abab 100755 --- a/configure +++ b/configure @@ -1,11 +1,12 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for MET development. +# Generated by GNU Autoconf 2.71 for MET development. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -16,14 +17,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -33,46 +36,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -81,13 +84,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -96,8 +92,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -109,30 +109,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -154,20 +134,22 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else +else \$as_nop case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -187,42 +169,52 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : -else +else \$as_nop exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" + if (eval "$as_required") 2>/dev/null +then : as_have_required=yes -else +else $as_nop as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : -else +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : break 2 fi fi @@ -230,14 +222,21 @@ fi esac as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi +fi - if test "x$CONFIG_SHELL" != x; then : + if test "x$CONFIG_SHELL" != x +then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -255,18 +254,19 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and $0: https://github.com/dtcenter/METplus/discussions about $0: your system, including any error possibly output before $0: this message. Then install a modern shell, or manually @@ -294,6 +294,7 @@ as_fn_unset () } as_unset=as_fn_unset + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -311,6 +312,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -325,7 +334,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -334,7 +343,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -373,12 +382,13 @@ as_fn_executable_p () # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -390,18 +400,27 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -413,9 +432,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -442,7 +461,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -486,7 +505,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -500,6 +519,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -513,6 +536,13 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -588,47 +618,40 @@ PACKAGE_URL='http://dtcenter.org/community-code/model-evaluation-tools-met' ac_unique_file="src/tools/tc_utils/tc_dland/tc_dland.cc" # Factoring default headers for most tests. ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include +#include +#ifdef HAVE_STDIO_H +# include #endif -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif #endif #ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif # include #endif -#ifdef HAVE_STRINGS_H -# include -#endif #ifdef HAVE_INTTYPES_H # include #endif #ifdef HAVE_STDINT_H # include #endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif #ifdef HAVE_UNISTD_H # include #endif" +ac_header_c_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -EGREP -GREP -CPP FLIBS host_os host_vendor @@ -790,6 +813,9 @@ AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V +CSCOPE +ETAGS +CTAGS am__untar am__tar AMTAR @@ -947,8 +973,7 @@ CXX CXXFLAGS CCC F77 -FFLAGS -CPP' +FFLAGS' # Initialize some variables set by options. @@ -1017,8 +1042,6 @@ do *) ac_optarg=yes ;; esac - # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -1059,9 +1082,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1085,9 +1108,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1298,9 +1321,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1314,9 +1337,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1360,9 +1383,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1378,7 +1401,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1442,7 +1465,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1800,7 +1823,6 @@ Some influential environment variables: CXXFLAGS C++ compiler flags F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags - CPP C preprocessor Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1822,9 +1844,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1852,7 +1874,8 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -1860,7 +1883,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1870,9 +1893,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF MET configure development -generated by GNU Autoconf 2.69 +generated by GNU Autoconf 2.71 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1889,14 +1912,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1904,14 +1927,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1927,14 +1951,14 @@ fi ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext + rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1942,17 +1966,18 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1973,14 +1998,14 @@ fi ac_fn_cxx_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1988,14 +2013,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -2011,14 +2037,14 @@ fi ac_fn_f77_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2026,14 +2052,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_f77_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -2043,176 +2070,6 @@ fi } # ac_fn_f77_try_compile -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## -------------------------------------------------------------- ## -## Report this to https://github.com/dtcenter/METplus/discussions ## -## -------------------------------------------------------------- ##" - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_mongrel - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists and can be compiled using the include files in @@ -2220,26 +2077,28 @@ fi ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -2251,17 +2110,18 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_type () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof ($2)) return 0; @@ -2269,12 +2129,13 @@ if (sizeof ($2)) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof (($2))) return 0; @@ -2282,18 +2143,19 @@ if (sizeof (($2))) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop eval "$3=yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type @@ -2305,11 +2167,12 @@ $as_echo "$ac_res" >&6; } ac_fn_c_find_intX_t () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5 -$as_echo_n "checking for int$2_t... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5 +printf %s "checking for int$2_t... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "$3=no" # Order is important - never check a type that is potentially smaller # than half of the expected target width. @@ -2320,7 +2183,7 @@ else $ac_includes_default enum { N = $2 / 2 - 1 }; int -main () +main (void) { static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; test_array [0] = 0; @@ -2330,13 +2193,14 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default enum { N = $2 / 2 - 1 }; int -main () +main (void) { static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; @@ -2347,9 +2211,10 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop case $ac_type in #( int$2_t) : eval "$3=yes" ;; #( @@ -2357,19 +2222,20 @@ else eval "$3=\$ac_type" ;; esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if eval test \"x\$"$3"\" = x"no"; then : +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + if eval test \"x\$"$3"\" = x"no" +then : -else +else $as_nop break fi done fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_find_intX_t @@ -2381,11 +2247,12 @@ $as_echo "$ac_res" >&6; } ac_fn_c_find_uintX_t () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5 -$as_echo_n "checking for uint$2_t... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5 +printf %s "checking for uint$2_t... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "$3=no" # Order is important - never check a type that is potentially smaller # than half of the expected target width. @@ -2395,7 +2262,7 @@ else /* end confdefs.h. */ $ac_includes_default int -main () +main (void) { static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; test_array [0] = 0; @@ -2405,7 +2272,8 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : case $ac_type in #( uint$2_t) : eval "$3=yes" ;; #( @@ -2413,17 +2281,18 @@ if ac_fn_c_try_compile "$LINENO"; then : eval "$3=\$ac_type" ;; esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if eval test \"x\$"$3"\" = x"no"; then : +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + if eval test \"x\$"$3"\" = x"no" +then : -else +else $as_nop break fi done fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_find_uintX_t @@ -2434,11 +2303,12 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case declares $2. @@ -2446,16 +2316,9 @@ else #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char $2 (); below. */ +#include #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -2473,35 +2336,56 @@ choke me #endif int -main () +main (void) { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done + +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +esac + cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by MET $as_me development, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was - $ $0 $@ + $ $0$ac_configure_args_raw _ACEOF exec 5>>config.log @@ -2534,8 +2418,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS @@ -2570,7 +2458,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -2605,11 +2493,13 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - $as_echo "## ---------------- ## + printf "%s\n" "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -2620,8 +2510,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -2645,7 +2535,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -2653,14 +2543,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + printf "%s\n" "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -2668,15 +2558,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - $as_echo "## ----------- ## + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -2684,8 +2574,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -2699,63 +2589,48 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -$as_echo "/* confdefs.h */" > confdefs.h +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" + +for ac_site_file in $ac_site_files do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -2765,123 +2640,728 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -fi -## -------------------- ## -## Main body of script. ## -## -------------------- ## - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -ac_config_headers="$ac_config_headers config.h" - +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif -am__api_version='1.16' +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) '\''x'\'' +int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), + int, int);' + +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' + +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +// Does the compiler advertise C99 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif + +#include +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + #error "your preprocessor is broken" +#endif +#if BIG_OK +#else + #error "your preprocessor is broken" +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case '\''s'\'': // string + str = va_arg (args_copy, const char *); + break; + case '\''d'\'': // int + number = va_arg (args_copy, int); + break; + case '\''f'\'': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +' + +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' + // Check bool. + _Bool success = false; + success |= (argc != 0); + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' + +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +// Does the compiler advertise C11 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif + +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' + +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" + +# Test code for whether the C++ compiler supports C++98 (global declarations) +ac_cxx_conftest_cxx98_globals=' +// Does the compiler advertise C++98 conformance? +#if !defined __cplusplus || __cplusplus < 199711L +# error "Compiler does not advertise C++98 conformance" +#endif + +// These inclusions are to reject old compilers that +// lack the unsuffixed header files. +#include +#include + +// and are *not* freestanding headers in C++98. +extern void assert (int); +namespace std { + extern int strcmp (const char *, const char *); +} + +// Namespaces, exceptions, and templates were all added after "C++ 2.0". +using std::exception; +using std::strcmp; + +namespace { + +void test_exception_syntax() +{ + try { + throw "test"; + } catch (const char *s) { + // Extra parentheses suppress a warning when building autoconf itself, + // due to lint rules shared with more typical C programs. + assert (!(strcmp) (s, "test")); + } +} + +template struct test_template +{ + T const val; + explicit test_template(T t) : val(t) {} + template T add(U u) { return static_cast(u) + val; } +}; + +} // anonymous namespace +' + +# Test code for whether the C++ compiler supports C++98 (body of main) +ac_cxx_conftest_cxx98_main=' + assert (argc); + assert (! argv[0]); +{ + test_exception_syntax (); + test_template tt (2.0); + assert (tt.add (4) == 6.0); + assert (true && !false); +} +' + +# Test code for whether the C++ compiler supports C++11 (global declarations) +ac_cxx_conftest_cxx11_globals=' +// Does the compiler advertise C++ 2011 conformance? +#if !defined __cplusplus || __cplusplus < 201103L +# error "Compiler does not advertise C++11 conformance" +#endif + +namespace cxx11test +{ + constexpr int get_val() { return 20; } + + struct testinit + { + int i; + double d; + }; + + class delegate + { + public: + delegate(int n) : n(n) {} + delegate(): delegate(2354) {} + + virtual int getval() { return this->n; }; + protected: + int n; + }; + + class overridden : public delegate + { + public: + overridden(int n): delegate(n) {} + virtual int getval() override final { return this->n * 2; } + }; + + class nocopy + { + public: + nocopy(int i): i(i) {} + nocopy() = default; + nocopy(const nocopy&) = delete; + nocopy & operator=(const nocopy&) = delete; + private: + int i; + }; + + // for testing lambda expressions + template Ret eval(Fn f, Ret v) + { + return f(v); + } + + // for testing variadic templates and trailing return types + template auto sum(V first) -> V + { + return first; + } + template auto sum(V first, Args... rest) -> V + { + return first + sum(rest...); + } +} +' + +# Test code for whether the C++ compiler supports C++11 (body of main) +ac_cxx_conftest_cxx11_main=' +{ + // Test auto and decltype + auto a1 = 6538; + auto a2 = 48573953.4; + auto a3 = "String literal"; + + int total = 0; + for (auto i = a3; *i; ++i) { total += *i; } + + decltype(a2) a4 = 34895.034; +} +{ + // Test constexpr + short sa[cxx11test::get_val()] = { 0 }; +} +{ + // Test initializer lists + cxx11test::testinit il = { 4323, 435234.23544 }; +} +{ + // Test range-based for + int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, + 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; + for (auto &x : array) { x += 23; } +} +{ + // Test lambda expressions + using cxx11test::eval; + assert (eval ([](int x) { return x*2; }, 21) == 42); + double d = 2.0; + assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0); + assert (d == 5.0); + assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0); + assert (d == 5.0); +} +{ + // Test use of variadic templates + using cxx11test::sum; + auto a = sum(1); + auto b = sum(1, 2); + auto c = sum(1.0, 2.0, 3.0); +} +{ + // Test constructor delegation + cxx11test::delegate d1; + cxx11test::delegate d2(); + cxx11test::delegate d3(45); +} +{ + // Test override and final + cxx11test::overridden o1(55464); +} +{ + // Test nullptr + char *c = nullptr; +} +{ + // Test template brackets + test_template<::test_template> v(test_template(12)); +} +{ + // Unicode literals + char const *utf8 = u8"UTF-8 string \u2500"; + char16_t const *utf16 = u"UTF-8 string \u2500"; + char32_t const *utf32 = U"UTF-32 string \u2500"; +} +' + +# Test code for whether the C compiler supports C++11 (complete). +ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals} +${ac_cxx_conftest_cxx11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_cxx_conftest_cxx98_main} + ${ac_cxx_conftest_cxx11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C++98 (complete). +ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals} +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_cxx_conftest_cxx98_main} + return ok; +} +" + +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" + +# Auxiliary files required by this configure script. +ac_aux_files="config.guess config.sub compile missing install-sh" + +# Locations in which to look for auxiliary files. +ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." + +# Search for a directory containing all of the required auxiliary files, +# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. +# If we don't find one directory that contains all the files we need, +# we report the set of missing files from the *first* directory in +# $ac_aux_dir_candidates and give up. +ac_missing_aux_files="" +ac_first_candidate=: +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" break fi + ac_first_candidate=false + + as_found=false done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 fi + # These three variables are undocumented and unsupported, # and are intended to be withdrawn in a future Autoconf release. # They can cause serious problems if a builder's source tree is in a directory # whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +if test -f "${ac_aux_dir}config.guess"; then + ac_config_guess="$SHELL ${ac_aux_dir}config.guess" +fi +if test -f "${ac_aux_dir}config.sub"; then + ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_configure="$SHELL ${ac_aux_dir}configure" +fi +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## -# Find a good install program. We prefer a C program (faster), +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +ac_config_headers="$ac_config_headers config.h" + + +am__api_version='1.16' + + + + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: # SysV /etc/install, /usr/sbin/install @@ -2895,20 +3375,25 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +printf %s "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${ac_cv_path_install+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + # Account for fact that we put trailing slashes in our PATH walk. +case $as_dir in #(( + ./ | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; @@ -2918,13 +3403,13 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # program-specific install script used by HP pwplus--don't use. : else @@ -2932,12 +3417,12 @@ case $as_dir/ in #(( echo one > conftest.one echo two > conftest.two mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && test -s conftest.one && test -s conftest.two && test -s conftest.dir/conftest.one && test -s conftest.dir/conftest.two then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" break 3 fi fi @@ -2953,7 +3438,7 @@ IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir fi - if test "${ac_cv_path_install+set}" = set; then + if test ${ac_cv_path_install+y}; then INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. Don't cache a @@ -2963,8 +3448,8 @@ fi INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +printf "%s\n" "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -2974,8 +3459,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +printf %s "checking whether build environment is sane... " >&6; } # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -3029,8 +3514,8 @@ else as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } # If we didn't sleep, we still need to ensure time stamps of config.status and # generated files are strictly newer. am_sleep_pid= @@ -3049,26 +3534,23 @@ test "$program_suffix" != NONE && # Double any \ or $. # By default was `s,x,x', remove it if useless. ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` +program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` + # Expand $ac_aux_dir to an absolute path. am_aux_dir=`cd "$ac_aux_dir" && pwd` -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + + if test x"${MISSING+set}" != xset; then + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh+set}" != xset; then @@ -3088,11 +3570,12 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -3100,11 +3583,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3115,11 +3602,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3128,11 +3615,12 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -3140,11 +3628,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3155,11 +3647,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -3167,8 +3659,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -3180,25 +3672,31 @@ fi fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 +printf %s "checking for a race-free mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${ac_cv_path_mkdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ + as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue + case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir ('*'coreutils) '* | \ + 'BusyBox '* | \ 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext break 3;; esac done @@ -3209,7 +3707,7 @@ IFS=$as_save_IFS fi test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then + if test ${ac_cv_path_mkdir+y}; then MKDIR_P="$ac_cv_path_mkdir -p" else # As a last resort, use the slow shell script. Don't cache a @@ -3219,18 +3717,19 @@ fi MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +printf "%s\n" "$MKDIR_P" >&6; } for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AWK+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -3238,11 +3737,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3253,24 +3756,25 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +printf "%s\n" "$AWK" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -n "$AWK" && break done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else +ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval test \${ac_cv_prog_make_${ac_make}_set+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @@ -3286,12 +3790,12 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -3305,7 +3809,8 @@ fi rmdir .tst 2>/dev/null # Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : +if test ${enable_silent_rules+y} +then : enableval=$enable_silent_rules; fi @@ -3315,12 +3820,13 @@ case $enable_silent_rules in # ((( *) AM_DEFAULT_VERBOSITY=1;; esac am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +printf %s "checking whether $am_make supports nested variables... " >&6; } +if test ${am_cv_make_support_nested_variables+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if printf "%s\n" 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -3332,8 +3838,8 @@ else am_cv_make_support_nested_variables=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -3368,14 +3874,10 @@ fi VERSION='development' -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF +printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF +printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h # Some tools Automake needs. @@ -3415,6 +3917,20 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi + +if test -z "$ETAGS"; then + ETAGS=etags +fi + +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi + + # POSIX will say in a future version that running "rm -f" with no argument # is OK; and we want to be able to make that assumption in our Makefile @@ -3461,12 +3977,24 @@ fi # OpenMP +if test -e penmp || test -e mp; then + as_fn_error $? "AC_OPENMP clobbers files named 'mp' and 'penmp'. Aborting configure because one of these files already exists." "$LINENO" 5 +fi + + + + + + + + + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 -$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; } cat > confinc.mk << 'END' am__doit: @echo this is the am__doit target >confinc.out @@ -3502,11 +4030,12 @@ esac fi done rm -f confinc.* confmf.* -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 -$as_echo "${_am_result}" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +printf "%s\n" "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : +if test ${enable_dependency_tracking+y} +then : enableval=$enable_dependency_tracking; fi @@ -3532,11 +4061,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -3544,11 +4074,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3559,11 +4093,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3572,11 +4106,12 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -3584,11 +4119,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3599,11 +4138,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -3611,8 +4150,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -3625,11 +4164,12 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -3637,11 +4177,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3652,11 +4196,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3665,11 +4209,12 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -3678,15 +4223,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3702,18 +4251,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3724,11 +4273,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -3736,11 +4286,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3751,11 +4305,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3768,11 +4322,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -3780,11 +4335,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3795,11 +4354,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3811,34 +4370,138 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC fi +else + CC="$ac_cv_prog_CC" fi fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3848,7 +4511,7 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -3856,7 +4519,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -3868,9 +4531,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -3891,11 +4554,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -3912,7 +4576,7 @@ do # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3928,44 +4592,46 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else +else $as_nop ac_file='' fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3979,15 +4645,15 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -3996,7 +4662,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -4008,8 +4674,8 @@ _ACEOF ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -4017,10 +4683,10 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -4028,39 +4694,40 @@ $as_echo "$ac_try_echo"; } >&5 *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details" "$LINENO" 5; } fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -4074,11 +4741,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -4087,31 +4755,32 @@ $as_echo "$ac_try_echo"; } >&5 break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -4121,29 +4790,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -4152,57 +4825,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else +else $as_nop CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -4217,94 +4893,144 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi fi ac_ext=c @@ -4313,21 +5039,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=c + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +printf %s "checking whether $CC understands -c and -o together... " >&6; } +if test ${am_cv_prog_cc_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -4355,8 +5083,8 @@ _ACEOF rm -f core conftest* unset am_i fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } if test "$am_cv_prog_cc_c_o" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. @@ -4374,11 +5102,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_CC_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -4485,8 +5214,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -4501,69 +5230,77 @@ fi - - OPENMP_CFLAGS= - # Check whether --enable-openmp was given. -if test "${enable_openmp+set}" = set; then : +# Check whether --enable-openmp was given. +if test ${enable_openmp+y} +then : enableval=$enable_openmp; fi + OPENMP_CFLAGS= if test "$enable_openmp" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to support OpenMP" >&5 -$as_echo_n "checking for $CC option to support OpenMP... " >&6; } -if ${ac_cv_prog_c_openmp+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to support OpenMP" >&5 +printf %s "checking for $CC option to support OpenMP... " >&6; } +if test ${ac_cv_prog_c_openmp+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_c_openmp='not found' + for ac_option in '' -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp -homp \ + -Popenmp --openmp; do + + ac_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $ac_option" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef _OPENMP - choke me +#error "OpenMP not supported" #endif #include -int main () { return omp_get_num_threads (); } +int main (void) { return omp_get_num_threads (); } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_prog_c_openmp='none needed' -else - ac_cv_prog_c_openmp='unsupported' - for ac_option in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp -homp \ - -Popenmp --openmp; do - ac_save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $ac_option" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +if ac_fn_c_try_compile "$LINENO" +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef _OPENMP - choke me +#error "OpenMP not supported" #endif #include -int main () { return omp_get_num_threads (); } +int main (void) { return omp_get_num_threads (); } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_prog_c_openmp=$ac_option +else $as_nop + ac_cv_prog_c_openmp='unsupported' fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS=$ac_save_CFLAGS - if test "$ac_cv_prog_c_openmp" != unsupported; then - break - fi - done fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + CFLAGS=$ac_save_CFLAGS + + if test "$ac_cv_prog_c_openmp" != 'not found'; then + break + fi + done + if test "$ac_cv_prog_c_openmp" = 'not found'; then + ac_cv_prog_c_openmp='unsupported' + elif test "$ac_cv_prog_c_openmp" = ''; then + ac_cv_prog_c_openmp='none needed' + fi + rm -f penmp mp fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_c_openmp" >&5 -$as_echo "$ac_cv_prog_c_openmp" >&6; } - case $ac_cv_prog_c_openmp in #( - "none needed" | unsupported) - ;; #( - *) - OPENMP_CFLAGS=$ac_cv_prog_c_openmp ;; - esac +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_c_openmp" >&5 +printf "%s\n" "$ac_cv_prog_c_openmp" >&6; } + if test "$ac_cv_prog_c_openmp" != 'unsupported' && \ + test "$ac_cv_prog_c_openmp" != 'none needed'; then + OPENMP_CFLAGS="$ac_cv_prog_c_openmp" + fi fi @@ -4859,8 +5596,8 @@ else BUFRLIB_NAME_SET_FALSE= fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: BUFRLIB_NAME will be set" >&5 -$as_echo "$as_me: BUFRLIB_NAME will be set" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: BUFRLIB_NAME will be set" >&5 +printf "%s\n" "$as_me: BUFRLIB_NAME will be set" >&6;} # # Look for the HDF library. @@ -4997,12 +5734,13 @@ fi # BLOCK4 # Check whether --enable-block4 was given. -if test "${enable_block4+set}" = set; then : +if test ${enable_block4+y} +then : enableval=$enable_block4; case "${enableval}" in yes | no ) ENABLE_BLOCK4="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-block4" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_BLOCK4="yes" fi @@ -5019,22 +5757,23 @@ fi if test "x$ENABLE_BLOCK4" = "xyes"; then CPPFLAGS="${CPPFLAGS} -DBLOCK4" - { $as_echo "$as_me:${as_lineno-$LINENO}: -DBLOCK4 will be used in the compiles" >&5 -$as_echo "$as_me: -DBLOCK4 will be used in the compiles" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -DBLOCK4 will be used in the compiles" >&5 +printf "%s\n" "$as_me: -DBLOCK4 will be used in the compiles" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: -DBLOCK4 will not be used in the compiles" >&5 -$as_echo "$as_me: -DBLOCK4 will not be used in the compiles" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -DBLOCK4 will not be used in the compiles" >&5 +printf "%s\n" "$as_me: -DBLOCK4 will not be used in the compiles" >&6;} fi # static linking # Check whether --enable-static_linking was given. -if test "${enable_static_linking+set}" = set; then : +if test ${enable_static_linking+y} +then : enableval=$enable_static_linking; case "${enableval}" in yes | no ) ENABLE_STATIC_LINKING="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --enable-static_linking" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_STATIC_LINKING="no" fi @@ -5051,22 +5790,23 @@ fi if test "x$ENABLE_STATIC_LINKING" = "xyes"; then LDFLAGS="${LDFLAGS} -static" - { $as_echo "$as_me:${as_lineno-$LINENO}: Static linking will be used in the compiles" >&5 -$as_echo "$as_me: Static linking will be used in the compiles" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Static linking will be used in the compiles" >&5 +printf "%s\n" "$as_me: Static linking will be used in the compiles" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: Dynamic linking will not be used in the compiles" >&5 -$as_echo "$as_me: Dynamic linking will not be used in the compiles" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Dynamic linking will not be used in the compiles" >&5 +printf "%s\n" "$as_me: Dynamic linking will not be used in the compiles" >&6;} fi # ascii2nc # Check whether --enable-ascii2nc was given. -if test "${enable_ascii2nc+set}" = set; then : +if test ${enable_ascii2nc+y} +then : enableval=$enable_ascii2nc; case "${enableval}" in yes | no ) ENABLE_ASCII2NC="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-ascii2nc" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_ASCII2NC="yes" fi @@ -5083,24 +5823,25 @@ fi if test "x$ENABLE_ASCII2NC" = "xyes"; then -$as_echo "#define ENABLE_ASCII2NC /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_ASCII2NC /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: ascii2nc will be compiled" >&5 -$as_echo "$as_me: ascii2nc will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ascii2nc will be compiled" >&5 +printf "%s\n" "$as_me: ascii2nc will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: ascii2nc will not be compiled" >&5 -$as_echo "$as_me: ascii2nc will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ascii2nc will not be compiled" >&5 +printf "%s\n" "$as_me: ascii2nc will not be compiled" >&6;} fi # lidar2nc # Check whether --enable-lidar2nc was given. -if test "${enable_lidar2nc+set}" = set; then : +if test ${enable_lidar2nc+y} +then : enableval=$enable_lidar2nc; case "${enableval}" in yes | no ) ENABLE_LIDAR2NC="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-lidar2nc" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_LIDAR2NC="no" fi @@ -5117,24 +5858,25 @@ fi if test "x$ENABLE_LIDAR2NC" = "xyes"; then -$as_echo "#define ENABLE_LIDAR2NC /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_LIDAR2NC /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: lidar2nc will be compiled" >&5 -$as_echo "$as_me: lidar2nc will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: lidar2nc will be compiled" >&5 +printf "%s\n" "$as_me: lidar2nc will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: lidar2nc will not be compiled" >&5 -$as_echo "$as_me: lidar2nc will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: lidar2nc will not be compiled" >&5 +printf "%s\n" "$as_me: lidar2nc will not be compiled" >&6;} fi # ensemble_stat # Check whether --enable-ensemble_stat was given. -if test "${enable_ensemble_stat+set}" = set; then : +if test ${enable_ensemble_stat+y} +then : enableval=$enable_ensemble_stat; case "${enableval}" in yes | no ) ENABLE_ENSEMBLE_STAT="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-ensemble_stat" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_ENSEMBLE_STAT="yes" fi @@ -5151,24 +5893,25 @@ fi if test "x$ENABLE_ENSEMBLE_STAT" = "xyes"; then -$as_echo "#define ENABLE_ENSEMBLE_STAT /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_ENSEMBLE_STAT /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: ensemble_stat will be compiled" >&5 -$as_echo "$as_me: ensemble_stat will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ensemble_stat will be compiled" >&5 +printf "%s\n" "$as_me: ensemble_stat will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: ensemble_stat will not be compiled" >&5 -$as_echo "$as_me: ensemble_stat will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ensemble_stat will not be compiled" >&5 +printf "%s\n" "$as_me: ensemble_stat will not be compiled" >&6;} fi # gen_ens_prod # Check whether --enable-gen_ens_prod was given. -if test "${enable_gen_ens_prod+set}" = set; then : +if test ${enable_gen_ens_prod+y} +then : enableval=$enable_gen_ens_prod; case "${enableval}" in yes | no ) ENABLE_GEN_ENS_PROD="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-gen_ens_prod" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_GEN_ENS_PROD="yes" fi @@ -5185,25 +5928,26 @@ fi if test "x$ENABLE_GEN_ENS_PROD" = "xyes"; then -$as_echo "#define ENABLE_GEN_ENS_PROD /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_GEN_ENS_PROD /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: gen_ens_prod will be compiled" >&5 -$as_echo "$as_me: gen_ens_prod will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: gen_ens_prod will be compiled" >&5 +printf "%s\n" "$as_me: gen_ens_prod will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: gen_ens_prod will not be compiled" >&5 -$as_echo "$as_me: gen_ens_prod will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: gen_ens_prod will not be compiled" >&5 +printf "%s\n" "$as_me: gen_ens_prod will not be compiled" >&6;} fi # gen_vx_mask # Check whether --enable-gen_vx_mask was given. -if test "${enable_gen_vx_mask+set}" = set; then : +if test ${enable_gen_vx_mask+y} +then : enableval=$enable_gen_vx_mask; case "${enableval}" in yes | no ) ENABLE_GEN_VX_MASK="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-gen_vx_mask" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_GEN_VX_MASK="yes" fi @@ -5220,25 +5964,26 @@ fi if test "x$ENABLE_GEN_VX_MASK" = "xyes"; then -$as_echo "#define ENABLE_GEN_VX_MASK /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_GEN_VX_MASK /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: gen_vx_mask will be compiled" >&5 -$as_echo "$as_me: gen_vx_mask will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: gen_vx_mask will be compiled" >&5 +printf "%s\n" "$as_me: gen_vx_mask will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: gen_vx_mask will not be compiled" >&5 -$as_echo "$as_me: gen_vx_mask will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: gen_vx_mask will not be compiled" >&5 +printf "%s\n" "$as_me: gen_vx_mask will not be compiled" >&6;} fi # gis_utils # Check whether --enable-gis_utils was given. -if test "${enable_gis_utils+set}" = set; then : +if test ${enable_gis_utils+y} +then : enableval=$enable_gis_utils; case "${enableval}" in yes | no ) ENABLE_GIS_UTILS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-gis_utils" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_GIS_UTILS="yes" fi @@ -5255,25 +6000,26 @@ fi if test "x$ENABLE_GIS_UTILS" = "xyes"; then -$as_echo "#define ENABLE_GIS_UTILS /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_GIS_UTILS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: gis_utils will be compiled" >&5 -$as_echo "$as_me: gis_utils will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: gis_utils will be compiled" >&5 +printf "%s\n" "$as_me: gis_utils will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: gis_utils will not be compiled" >&5 -$as_echo "$as_me: gis_utils will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: gis_utils will not be compiled" >&5 +printf "%s\n" "$as_me: gis_utils will not be compiled" >&6;} fi # grid_stat # Check whether --enable-grid_stat was given. -if test "${enable_grid_stat+set}" = set; then : +if test ${enable_grid_stat+y} +then : enableval=$enable_grid_stat; case "${enableval}" in yes | no ) ENABLE_GRID_STAT="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-grid_stat" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_GRID_STAT="yes" fi @@ -5290,24 +6036,25 @@ fi if test "x$ENABLE_GRID_STAT" = "xyes"; then -$as_echo "#define ENABLE_GRID_STAT /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_GRID_STAT /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: grid_stat will be compiled" >&5 -$as_echo "$as_me: grid_stat will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: grid_stat will be compiled" >&5 +printf "%s\n" "$as_me: grid_stat will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: grid_stat will not be compiled" >&5 -$as_echo "$as_me: grid_stat will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: grid_stat will not be compiled" >&5 +printf "%s\n" "$as_me: grid_stat will not be compiled" >&6;} fi # ioda2nc # Check whether --enable-ioda2nc was given. -if test "${enable_ioda2nc+set}" = set; then : +if test ${enable_ioda2nc+y} +then : enableval=$enable_ioda2nc; case "${enableval}" in yes | no ) ENABLE_IODA2NC="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-ioda2nc" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_IODA2NC="yes" fi @@ -5324,24 +6071,25 @@ fi if test "x$ENABLE_IODA2NC" = "xyes"; then -$as_echo "#define ENABLE_IODA2NC /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_IODA2NC /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: ioda2nc will be compiled" >&5 -$as_echo "$as_me: ioda2nc will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ioda2nc will be compiled" >&5 +printf "%s\n" "$as_me: ioda2nc will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: ioda2nc will not be compiled" >&5 -$as_echo "$as_me: ioda2nc will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ioda2nc will not be compiled" >&5 +printf "%s\n" "$as_me: ioda2nc will not be compiled" >&6;} fi # madis2nc # Check whether --enable-madis2nc was given. -if test "${enable_madis2nc+set}" = set; then : +if test ${enable_madis2nc+y} +then : enableval=$enable_madis2nc; case "${enableval}" in yes | no ) ENABLE_MADIS2NC="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-madis2nc" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_MADIS2NC="yes" fi @@ -5358,24 +6106,25 @@ fi if test "x$ENABLE_MADIS2NC" = "xyes"; then -$as_echo "#define ENABLE_MADIS2NC /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_MADIS2NC /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: madis2nc will be compiled" >&5 -$as_echo "$as_me: madis2nc will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: madis2nc will be compiled" >&5 +printf "%s\n" "$as_me: madis2nc will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: madis2nc will not be compiled" >&5 -$as_echo "$as_me: madis2nc will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: madis2nc will not be compiled" >&5 +printf "%s\n" "$as_me: madis2nc will not be compiled" >&6;} fi # mode # Check whether --enable-mode was given. -if test "${enable_mode+set}" = set; then : +if test ${enable_mode+y} +then : enableval=$enable_mode; case "${enableval}" in yes | no ) ENABLE_MODE="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-mode" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_MODE="yes" fi @@ -5392,24 +6141,25 @@ fi if test "x$ENABLE_MODE" = "xyes"; then -$as_echo "#define ENABLE_MODE /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_MODE /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: mode will be compiled" >&5 -$as_echo "$as_me: mode will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: mode will be compiled" >&5 +printf "%s\n" "$as_me: mode will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: mode will not be compiled" >&5 -$as_echo "$as_me: mode will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: mode will not be compiled" >&5 +printf "%s\n" "$as_me: mode will not be compiled" >&6;} fi # mode_analysis # Check whether --enable-mode_analysis was given. -if test "${enable_mode_analysis+set}" = set; then : +if test ${enable_mode_analysis+y} +then : enableval=$enable_mode_analysis; case "${enableval}" in yes | no ) ENABLE_MODE_ANALYSIS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-mode_analysis" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_MODE_ANALYSIS="yes" fi @@ -5426,24 +6176,25 @@ fi if test "x$ENABLE_MODE_ANALYSIS" = "xyes"; then -$as_echo "#define ENABLE_MODE_ANALYSIS /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_MODE_ANALYSIS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: mode_analysis will be compiled" >&5 -$as_echo "$as_me: mode_analysis will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: mode_analysis will be compiled" >&5 +printf "%s\n" "$as_me: mode_analysis will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: mode_analysis will not be compiled" >&5 -$as_echo "$as_me: mode_analysis will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: mode_analysis will not be compiled" >&5 +printf "%s\n" "$as_me: mode_analysis will not be compiled" >&6;} fi # pb2nc # Check whether --enable-pb2nc was given. -if test "${enable_pb2nc+set}" = set; then : +if test ${enable_pb2nc+y} +then : enableval=$enable_pb2nc; case "${enableval}" in yes | no ) ENABLE_PB2NC="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-pb2nc" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_PB2NC="yes" fi @@ -5460,24 +6211,25 @@ fi if test "x$ENABLE_PB2NC" = "xyes"; then -$as_echo "#define ENABLE_PB2NC /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_PB2NC /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: pb2nc will be compiled" >&5 -$as_echo "$as_me: pb2nc will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pb2nc will be compiled" >&5 +printf "%s\n" "$as_me: pb2nc will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: pb2nc will not be compiled" >&5 -$as_echo "$as_me: pb2nc will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pb2nc will not be compiled" >&5 +printf "%s\n" "$as_me: pb2nc will not be compiled" >&6;} fi # pcp_combine # Check whether --enable-pcp_combine was given. -if test "${enable_pcp_combine+set}" = set; then : +if test ${enable_pcp_combine+y} +then : enableval=$enable_pcp_combine; case "${enableval}" in yes | no ) ENABLE_PCP_COMBINE="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-pcp_combine" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_PCP_COMBINE="yes" fi @@ -5494,24 +6246,25 @@ fi if test "x$ENABLE_PCP_COMBINE" = "xyes"; then -$as_echo "#define ENABLE_PCP_COMBINE /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_PCP_COMBINE /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: pcp_combine will be compiled" >&5 -$as_echo "$as_me: pcp_combine will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pcp_combine will be compiled" >&5 +printf "%s\n" "$as_me: pcp_combine will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: pcp_combine will not be compiled" >&5 -$as_echo "$as_me: pcp_combine will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pcp_combine will not be compiled" >&5 +printf "%s\n" "$as_me: pcp_combine will not be compiled" >&6;} fi # plot_data_plane # Check whether --enable-plot_data_plane was given. -if test "${enable_plot_data_plane+set}" = set; then : +if test ${enable_plot_data_plane+y} +then : enableval=$enable_plot_data_plane; case "${enableval}" in yes | no ) ENABLE_PLOT_DATA_PLANE="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-plot_data_plane" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_PLOT_DATA_PLANE="yes" fi @@ -5528,24 +6281,25 @@ fi if test "x$ENABLE_PLOT_DATA_PLANE" = "xyes"; then -$as_echo "#define ENABLE_PLOT_DATA_PLANE /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_PLOT_DATA_PLANE /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: plot_data_plane will be compiled" >&5 -$as_echo "$as_me: plot_data_plane will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: plot_data_plane will be compiled" >&5 +printf "%s\n" "$as_me: plot_data_plane will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: plot_data_plane will not be compiled" >&5 -$as_echo "$as_me: plot_data_plane will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: plot_data_plane will not be compiled" >&5 +printf "%s\n" "$as_me: plot_data_plane will not be compiled" >&6;} fi # regrid_data_plane # Check whether --enable-regrid_data_plane was given. -if test "${enable_regrid_data_plane+set}" = set; then : +if test ${enable_regrid_data_plane+y} +then : enableval=$enable_regrid_data_plane; case "${enableval}" in yes | no ) ENABLE_REGRID_DATA_PLANE="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-regrid_data_plane" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_REGRID_DATA_PLANE="yes" fi @@ -5562,24 +6316,25 @@ fi if test "x$ENABLE_REGRID_DATA_PLANE" = "xyes"; then -$as_echo "#define ENABLE_REGRID_DATA_PLANE /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_REGRID_DATA_PLANE /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: regrid_data_plane will be compiled" >&5 -$as_echo "$as_me: regrid_data_plane will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: regrid_data_plane will be compiled" >&5 +printf "%s\n" "$as_me: regrid_data_plane will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: regrid_data_plane will not be compiled" >&5 -$as_echo "$as_me: regrid_data_plane will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: regrid_data_plane will not be compiled" >&5 +printf "%s\n" "$as_me: regrid_data_plane will not be compiled" >&6;} fi # point2grid # Check whether --enable-point2grid was given. -if test "${enable_point2grid+set}" = set; then : +if test ${enable_point2grid+y} +then : enableval=$enable_point2grid; case "${enableval}" in yes | no ) ENABLE_POINT2GRID="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-point2grid" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_POINT2GRID="yes" fi @@ -5596,24 +6351,25 @@ fi if test "x$ENABLE_POINT2GRID" = "xyes"; then -$as_echo "#define ENABLE_POINT2GRID /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_POINT2GRID /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: point2grid will be compiled" >&5 -$as_echo "$as_me: point2grid will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: point2grid will be compiled" >&5 +printf "%s\n" "$as_me: point2grid will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: point2grid will not be compiled" >&5 -$as_echo "$as_me: point2grid will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: point2grid will not be compiled" >&5 +printf "%s\n" "$as_me: point2grid will not be compiled" >&6;} fi # shift_data_plane # Check whether --enable-shift_data_plane was given. -if test "${enable_shift_data_plane+set}" = set; then : +if test ${enable_shift_data_plane+y} +then : enableval=$enable_shift_data_plane; case "${enableval}" in yes | no ) ENABLE_SHIFT_DATA_PLANE="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-shift_data_plane" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_SHIFT_DATA_PLANE="yes" fi @@ -5630,24 +6386,25 @@ fi if test "x$ENABLE_SHIFT_DATA_PLANE" = "xyes"; then -$as_echo "#define ENABLE_SHIFT_DATA_PLANE /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_SHIFT_DATA_PLANE /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: shift_data_plane will be compiled" >&5 -$as_echo "$as_me: shift_data_plane will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: shift_data_plane will be compiled" >&5 +printf "%s\n" "$as_me: shift_data_plane will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: shift_data_plane will not be compiled" >&5 -$as_echo "$as_me: shift_data_plane will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: shift_data_plane will not be compiled" >&5 +printf "%s\n" "$as_me: shift_data_plane will not be compiled" >&6;} fi # plot_point_obs # Check whether --enable-plot_point_obs was given. -if test "${enable_plot_point_obs+set}" = set; then : +if test ${enable_plot_point_obs+y} +then : enableval=$enable_plot_point_obs; case "${enableval}" in yes | no ) ENABLE_PLOT_POINT_OBS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-plot_point_obs" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_PLOT_POINT_OBS="yes" fi @@ -5664,24 +6421,25 @@ fi if test "x$ENABLE_PLOT_POINT_OBS" = "xyes"; then -$as_echo "#define ENABLE_PLOT_POINT_OBS /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_PLOT_POINT_OBS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: plot_point_obs will be compiled" >&5 -$as_echo "$as_me: plot_point_obs will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: plot_point_obs will be compiled" >&5 +printf "%s\n" "$as_me: plot_point_obs will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: plot_point_obs will not be compiled" >&5 -$as_echo "$as_me: plot_point_obs will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: plot_point_obs will not be compiled" >&5 +printf "%s\n" "$as_me: plot_point_obs will not be compiled" >&6;} fi # point_stat # Check whether --enable-point_stat was given. -if test "${enable_point_stat+set}" = set; then : +if test ${enable_point_stat+y} +then : enableval=$enable_point_stat; case "${enableval}" in yes | no ) ENABLE_POINT_STAT="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-point_stat" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_POINT_STAT="yes" fi @@ -5698,24 +6456,25 @@ fi if test "x$ENABLE_POINT_STAT" = "xyes"; then -$as_echo "#define ENABLE_POINT_STAT /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_POINT_STAT /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: point_stat will be compiled" >&5 -$as_echo "$as_me: point_stat will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: point_stat will be compiled" >&5 +printf "%s\n" "$as_me: point_stat will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: point_stat will not be compiled" >&5 -$as_echo "$as_me: point_stat will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: point_stat will not be compiled" >&5 +printf "%s\n" "$as_me: point_stat will not be compiled" >&6;} fi # stat_analysis # Check whether --enable-stat_analysis was given. -if test "${enable_stat_analysis+set}" = set; then : +if test ${enable_stat_analysis+y} +then : enableval=$enable_stat_analysis; case "${enableval}" in yes | no ) ENABLE_STAT_ANALYSIS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-stat_analysis" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_STAT_ANALYSIS="yes" fi @@ -5732,24 +6491,25 @@ fi if test "x$ENABLE_STAT_ANALYSIS" = "xyes"; then -$as_echo "#define ENABLE_STAT_ANALYSIS /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_STAT_ANALYSIS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: stat_analysis will be compiled" >&5 -$as_echo "$as_me: stat_analysis will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: stat_analysis will be compiled" >&5 +printf "%s\n" "$as_me: stat_analysis will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: stat_analysis will not be compiled" >&5 -$as_echo "$as_me: stat_analysis will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: stat_analysis will not be compiled" >&5 +printf "%s\n" "$as_me: stat_analysis will not be compiled" >&6;} fi # wavelet_stat # Check whether --enable-wavelet_stat was given. -if test "${enable_wavelet_stat+set}" = set; then : +if test ${enable_wavelet_stat+y} +then : enableval=$enable_wavelet_stat; case "${enableval}" in yes | no ) ENABLE_WAVELET_STAT="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-wavelet_stat" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_WAVELET_STAT="yes" fi @@ -5766,24 +6526,25 @@ fi if test "x$ENABLE_WAVELET_STAT" = "xyes"; then -$as_echo "#define ENABLE_WAVELET_STAT /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_WAVELET_STAT /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: wavelet_stat will be compiled" >&5 -$as_echo "$as_me: wavelet_stat will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: wavelet_stat will be compiled" >&5 +printf "%s\n" "$as_me: wavelet_stat will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: wavelet_stat will not be compiled" >&5 -$as_echo "$as_me: wavelet_stat will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: wavelet_stat will not be compiled" >&5 +printf "%s\n" "$as_me: wavelet_stat will not be compiled" >&6;} fi # series_analysis # Check whether --enable-series_analysis was given. -if test "${enable_series_analysis+set}" = set; then : +if test ${enable_series_analysis+y} +then : enableval=$enable_series_analysis; case "${enableval}" in yes | no ) ENABLE_SERIES_ANALYSIS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-series_analysis" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_SERIES_ANALYSIS="yes" fi @@ -5800,24 +6561,25 @@ fi if test "x$ENABLE_SERIES_ANALYSIS" = "xyes"; then -$as_echo "#define ENABLE_SERIES_ANALYSIS /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_SERIES_ANALYSIS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: series_analysis will be compiled" >&5 -$as_echo "$as_me: series_analysis will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: series_analysis will be compiled" >&5 +printf "%s\n" "$as_me: series_analysis will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: series_analysis will not be compiled" >&5 -$as_echo "$as_me: series_analysis will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: series_analysis will not be compiled" >&5 +printf "%s\n" "$as_me: series_analysis will not be compiled" >&6;} fi # wwmca # Check whether --enable-wwmca was given. -if test "${enable_wwmca+set}" = set; then : +if test ${enable_wwmca+y} +then : enableval=$enable_wwmca; case "${enableval}" in yes | no ) ENABLE_WWMCA="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-wwmca" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_WWMCA="yes" fi @@ -5834,24 +6596,25 @@ fi if test "x$ENABLE_WWMCA" = "xyes"; then -$as_echo "#define ENABLE_WWMCA /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_WWMCA /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: wwmca will be compiled" >&5 -$as_echo "$as_me: wwmca will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: wwmca will be compiled" >&5 +printf "%s\n" "$as_me: wwmca will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: wwmca will not be compiled" >&5 -$as_echo "$as_me: wwmca will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: wwmca will not be compiled" >&5 +printf "%s\n" "$as_me: wwmca will not be compiled" >&6;} fi # modis # Check whether --enable-modis was given. -if test "${enable_modis+set}" = set; then : +if test ${enable_modis+y} +then : enableval=$enable_modis; case "${enableval}" in yes | no ) ENABLE_MODIS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-modis" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_MODIS="no" fi @@ -5868,24 +6631,25 @@ fi if test "x$ENABLE_MODIS" = "xyes"; then -$as_echo "#define ENABLE_MODIS /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_MODIS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: modis will be compiled" >&5 -$as_echo "$as_me: modis will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: modis will be compiled" >&5 +printf "%s\n" "$as_me: modis will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: modis will not be compiled" >&5 -$as_echo "$as_me: modis will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: modis will not be compiled" >&5 +printf "%s\n" "$as_me: modis will not be compiled" >&6;} fi # mode_graphics # Check whether --enable-mode_graphics was given. -if test "${enable_mode_graphics+set}" = set; then : +if test ${enable_mode_graphics+y} +then : enableval=$enable_mode_graphics; case "${enableval}" in yes | no ) ENABLE_MODE_GRAPHICS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --enable-mode_graphics" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_MODE_GRAPHICS="no" fi @@ -5902,24 +6666,25 @@ fi if test "x$ENABLE_MODE_GRAPHICS" = "xyes"; then -$as_echo "#define ENABLE_MODE_GRAPHICS /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_MODE_GRAPHICS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: mode_graphics will be compiled" >&5 -$as_echo "$as_me: mode_graphics will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: mode_graphics will be compiled" >&5 +printf "%s\n" "$as_me: mode_graphics will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: mode_graphics will not be compiled" >&5 -$as_echo "$as_me: mode_graphics will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: mode_graphics will not be compiled" >&5 +printf "%s\n" "$as_me: mode_graphics will not be compiled" >&6;} fi # mode_time_domain # Check whether --enable-mode_time_domain was given. -if test "${enable_mode_time_domain+set}" = set; then : +if test ${enable_mode_time_domain+y} +then : enableval=$enable_mode_time_domain; case "${enableval}" in yes | no ) ENABLE_MODE_TIME_DOMAIN="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-mode_time_domain" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_MODE_TIME_DOMAIN="yes" fi @@ -5936,24 +6701,25 @@ fi if test "x$ENABLE_MODE_TIME_DOMAIN" = "xyes"; then -$as_echo "#define ENABLE_MODE_TIME_DOMAIN /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_MODE_TIME_DOMAIN /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: mode_time_domain will be compiled" >&5 -$as_echo "$as_me: mode_time_domain will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: mode_time_domain will be compiled" >&5 +printf "%s\n" "$as_me: mode_time_domain will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: mode_time_domain will not be compiled" >&5 -$as_echo "$as_me: mode_time_domain will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: mode_time_domain will not be compiled" >&5 +printf "%s\n" "$as_me: mode_time_domain will not be compiled" >&6;} fi # tc_utils # Check whether --enable-tc_utils was given. -if test "${enable_tc_utils+set}" = set; then : +if test ${enable_tc_utils+y} +then : enableval=$enable_tc_utils; case "${enableval}" in yes | no ) ENABLE_TC_UTILS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-tc_utils" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_TC_UTILS="yes" fi @@ -5970,24 +6736,25 @@ fi if test "x$ENABLE_TC_UTILS" = "xyes"; then -$as_echo "#define ENABLE_TC_UTILS /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_TC_UTILS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: tc_utils will be compiled" >&5 -$as_echo "$as_me: tc_utils will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: tc_utils will be compiled" >&5 +printf "%s\n" "$as_me: tc_utils will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: tc_utils will not be compiled" >&5 -$as_echo "$as_me: tc_utils will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: tc_utils will not be compiled" >&5 +printf "%s\n" "$as_me: tc_utils will not be compiled" >&6;} fi # gsi_tools # Check whether --enable-gsi_tools was given. -if test "${enable_gsi_tools+set}" = set; then : +if test ${enable_gsi_tools+y} +then : enableval=$enable_gsi_tools; case "${enableval}" in yes | no ) ENABLE_GSI_TOOLS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-gsi_tools" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_GSI_TOOLS="yes" fi @@ -6004,24 +6771,25 @@ fi if test "x$ENABLE_GSI_TOOLS" = "xyes"; then -$as_echo "#define ENABLE_GSI_TOOLS /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_GSI_TOOLS /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: gsi_tools will be compiled" >&5 -$as_echo "$as_me: gsi_tools will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: gsi_tools will be compiled" >&5 +printf "%s\n" "$as_me: gsi_tools will be compiled" >&6;} else - { $as_echo "$as_me:${as_lineno-$LINENO}: gsi_tools will not be compiled" >&5 -$as_echo "$as_me: gsi_tools will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: gsi_tools will not be compiled" >&5 +printf "%s\n" "$as_me: gsi_tools will not be compiled" >&6;} fi # GRIB2 # Check whether --enable-grib2 was given. -if test "${enable_grib2+set}" = set; then : +if test ${enable_grib2+y} +then : enableval=$enable_grib2; case "${enableval}" in yes | no ) ENABLE_GRIB2="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --enable-grib2" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_GRIB2="no" fi @@ -6046,22 +6814,22 @@ fi if test "x$ENABLE_GRIB2" = "xyes"; then -$as_echo "#define ENABLE_GRIB2 /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_GRIB2 /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: GRIB2 utilites will be compiled" >&5 -$as_echo "$as_me: GRIB2 utilites will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: GRIB2 utilites will be compiled" >&5 +printf "%s\n" "$as_me: GRIB2 utilites will be compiled" >&6;} CPPFLAGS="${CPPFLAGS} -DWITH_GRIB2" - { $as_echo "$as_me:${as_lineno-$LINENO}: GRIB2CLIB_NAME will be set" >&5 -$as_echo "$as_me: GRIB2CLIB_NAME will be set" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: GRIB2CLIB_NAME will be set" >&5 +printf "%s\n" "$as_me: GRIB2CLIB_NAME will be set" >&6;} if test -z "$GRIB2CLIB_NAME"; then GRIB2_LIBS="-lvx_data2d_grib2 -lgrib2c -ljasper -lpng -lz" else GRIB2_LIBS="-lvx_data2d_grib2 ${GRIB2CLIB_NAME} -ljasper -lpng -lz" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: GRIB2 utilities will not be compiled" >&5 -$as_echo "$as_me: GRIB2 utilities will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: GRIB2 utilities will not be compiled" >&5 +printf "%s\n" "$as_me: GRIB2 utilities will not be compiled" >&6;} GRIB2_LIBS= fi @@ -6069,12 +6837,13 @@ fi # Python # Check whether --enable-python was given. -if test "${enable_python+set}" = set; then : +if test ${enable_python+y} +then : enableval=$enable_python; case "${enableval}" in yes | no ) ENABLE_PYTHON="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --enable-python" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_PYTHON="no" fi @@ -6091,15 +6860,15 @@ fi if test "x$ENABLE_PYTHON" = "xyes"; then -$as_echo "#define ENABLE_PYTHON /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_PYTHON /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: python embedding will be compiled" >&5 -$as_echo "$as_me: python embedding will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: python embedding will be compiled" >&5 +printf "%s\n" "$as_me: python embedding will be compiled" >&6;} CPPFLAGS="${CPPFLAGS} -DWITH_PYTHON" PYTHON_LIBS="-lvx_data2d_python -lvx_pointdata_python -lvx_python3_utils ${MET_PYTHON_LD}" else - { $as_echo "$as_me:${as_lineno-$LINENO}: python embedding will not be compiled" >&5 -$as_echo "$as_me: python embedding will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: python embedding will not be compiled" >&5 +printf "%s\n" "$as_me: python embedding will not be compiled" >&6;} PYTHON_LIBS= fi @@ -6107,12 +6876,13 @@ fi # Unstructure grid with ECMF libraries (Atlas/ecKit) # Check whether --enable-ugrid was given. -if test "${enable_ugrid+set}" = set; then : +if test ${enable_ugrid+y} +then : enableval=$enable_ugrid; case "${enableval}" in yes | no ) ENABLE_UGRID="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --enable-ugrid" "$LINENO" 5 ;; esac -else +else $as_nop ENABLE_UGRID="no" fi @@ -6129,16 +6899,16 @@ fi if test "x$ENABLE_UGRID" = "xyes"; then -$as_echo "#define ENABLE_UGRID /**/" >>confdefs.h +printf "%s\n" "#define ENABLE_UGRID /**/" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: unstructured grid will be compiled" >&5 -$as_echo "$as_me: unstructured grid will be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: unstructured grid will be compiled" >&5 +printf "%s\n" "$as_me: unstructured grid will be compiled" >&6;} CPPFLAGS="${CPPFLAGS} -I${MET_ATLASINC} -I${MET_ECKITINC} -DWITH_UGRID" LDFLAGS="${LDFLAGS} -L${MET_ATLASLIB} -L${MET_ECKITLIB} -Wl,-rpath,${MET_ATLASLIB}:${MET_ECKITLIB}" UGRID_LIBS="-lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry" else - { $as_echo "$as_me:${as_lineno-$LINENO}: unstructured grid will not be compiled" >&5 -$as_echo "$as_me: unstructured grid will not be compiled" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: unstructured grid will not be compiled" >&5 +printf "%s\n" "$as_me: unstructured grid will not be compiled" >&6;} UGRID_LIBS= fi @@ -6195,11 +6965,12 @@ for ac_prog in 'bison -y' byacc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_YACC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_YACC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else @@ -6207,11 +6978,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_YACC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6222,11 +6997,11 @@ fi fi YACC=$ac_cv_prog_YACC if test -n "$YACC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 -$as_echo "$YACC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 +printf "%s\n" "$YACC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6234,6 +7009,12 @@ fi done test -n "$YACC" || YACC="yacc" + + + + + + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6244,15 +7025,16 @@ if test -z "$CXX"; then CXX=$CCC else if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else @@ -6260,11 +7042,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6275,11 +7061,11 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +printf "%s\n" "$CXX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6288,15 +7074,16 @@ fi fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. else @@ -6304,11 +7091,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6319,11 +7110,11 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +printf "%s\n" "$ac_ct_CXX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6335,8 +7126,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX @@ -6346,7 +7137,7 @@ fi fi fi # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -6356,7 +7147,7 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -6366,20 +7157,21 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if ${ac_cv_cxx_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 +printf %s "checking whether the compiler supports GNU C++... " >&6; } +if test ${ac_cv_cxx_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -6389,29 +7181,33 @@ main () return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + if test $ac_compiler_gnu = yes; then GXX=yes else GXX= fi -ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_test_CXXFLAGS=${CXXFLAGS+y} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if ${ac_cv_prog_cxx_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +printf %s "checking whether $CXX accepts -g... " >&6; } +if test ${ac_cv_prog_cxx_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes ac_cv_prog_cxx_g=no @@ -6420,57 +7216,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_cv_prog_cxx_g=yes -else +else $as_nop CXXFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : -else +else $as_nop ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_cv_prog_cxx_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } +if test $ac_test_CXXFLAGS; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then if test "$GXX" = yes; then @@ -6485,6 +7284,100 @@ else CXXFLAGS= fi fi +ac_prog_cxx_stdcxx=no +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 +printf %s "checking for $CXX option to enable C++11 features... " >&6; } +if test ${ac_cv_prog_cxx_11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cxx_11=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx11_program +_ACEOF +for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx11" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +fi + +if test "x$ac_cv_prog_cxx_cxx11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx11" +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 + ac_prog_cxx_stdcxx=cxx11 +fi +fi +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 +printf %s "checking for $CXX option to enable C++98 features... " >&6; } +if test ${ac_cv_prog_cxx_98+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cxx_98=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx98_program +_ACEOF +for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx98=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx98" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +fi + +if test "x$ac_cv_prog_cxx_cxx98" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx98" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx98" +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 + ac_prog_cxx_stdcxx=cxx98 +fi +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6493,11 +7386,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CXX" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CXX_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_CXX_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -6604,8 +7498,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type if @@ -6627,11 +7521,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -6639,11 +7534,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6654,11 +7553,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6667,11 +7566,12 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -6679,11 +7579,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6694,11 +7598,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -6706,8 +7610,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -6720,11 +7624,12 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -6732,11 +7637,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6747,11 +7656,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6760,11 +7669,12 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -6773,15 +7683,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6797,18 +7711,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6819,11 +7733,122 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -6831,11 +7856,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6846,28 +7875,25 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - test -n "$CC" && break - done fi -if test -z "$CC"; then +if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -6875,11 +7901,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6890,50 +7920,48 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - - test -n "$ac_ct_CC" && break -done - if test "x$ac_ct_CC" = x; then CC="" else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC fi +else + CC="$ac_cv_prog_CC" fi fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -6943,20 +7971,21 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -6966,29 +7995,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -6997,57 +8030,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else +else $as_nop CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -7062,94 +8098,144 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi fi ac_ext=c @@ -7158,21 +8244,23 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=c + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +printf %s "checking whether $CC understands -c and -o together... " >&6; } +if test ${am_cv_prog_cc_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -7200,8 +8288,8 @@ _ACEOF rm -f core conftest* unset am_i fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } if test "$am_cv_prog_cc_c_o" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. @@ -7219,11 +8307,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_CC_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -7330,8 +8419,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -7354,11 +8443,12 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_F77+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_F77+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$F77"; then ac_cv_prog_F77="$F77" # Let the user override the test. else @@ -7366,11 +8456,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7381,11 +8475,11 @@ fi fi F77=$ac_cv_prog_F77 if test -n "$F77"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5 -$as_echo "$F77" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $F77" >&5 +printf "%s\n" "$F77" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7398,11 +8492,12 @@ if test -z "$F77"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_F77+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_F77+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_F77"; then ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. else @@ -7410,11 +8505,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_F77="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7425,11 +8524,11 @@ fi fi ac_ct_F77=$ac_cv_prog_ac_ct_F77 if test -n "$ac_ct_F77"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5 -$as_echo "$ac_ct_F77" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5 +printf "%s\n" "$ac_ct_F77" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7441,8 +8540,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac F77=$ac_ct_F77 @@ -7451,7 +8550,7 @@ fi # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -7461,7 +8560,7 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -7471,7 +8570,7 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done rm -f a.out @@ -7480,11 +8579,12 @@ rm -f a.out # input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5 -$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } -if ${ac_cv_f77_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU Fortran 77" >&5 +printf %s "checking whether the compiler supports GNU Fortran 77... " >&6; } +if test ${ac_cv_f77_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat > conftest.$ac_ext <<_ACEOF program main #ifndef __GNUC__ @@ -7493,43 +8593,48 @@ else end _ACEOF -if ac_fn_f77_try_compile "$LINENO"; then : +if ac_fn_f77_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5 -$as_echo "$ac_cv_f77_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_f77_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_f77_compiler_gnu + ac_ext=$ac_save_ext -ac_test_FFLAGS=${FFLAGS+set} +ac_test_FFLAGS=${FFLAGS+y} ac_save_FFLAGS=$FFLAGS FFLAGS= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5 -$as_echo_n "checking whether $F77 accepts -g... " >&6; } -if ${ac_cv_prog_f77_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5 +printf %s "checking whether $F77 accepts -g... " >&6; } +if test ${ac_cv_prog_f77_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop FFLAGS=-g cat > conftest.$ac_ext <<_ACEOF program main end _ACEOF -if ac_fn_f77_try_compile "$LINENO"; then : +if ac_fn_f77_try_compile "$LINENO" +then : ac_cv_prog_f77_g=yes -else +else $as_nop ac_cv_prog_f77_g=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5 -$as_echo "$ac_cv_prog_f77_g" >&6; } -if test "$ac_test_FFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5 +printf "%s\n" "$ac_cv_prog_f77_g" >&6; } +if test $ac_test_FFLAGS; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then if test "x$ac_cv_f77_compiler_gnu" = xyes; then @@ -7560,11 +8665,12 @@ for ac_prog in flex lex do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LEX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_LEX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$LEX"; then ac_cv_prog_LEX="$LEX" # Let the user override the test. else @@ -7572,11 +8678,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_LEX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7587,11 +8697,11 @@ fi fi LEX=$ac_cv_prog_LEX if test -n "$LEX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 -$as_echo "$LEX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 +printf "%s\n" "$LEX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7599,15 +8709,26 @@ fi done test -n "$LEX" || LEX=":" -if test "x$LEX" != "x:"; then - cat >conftest.l <<_ACEOF + if test "x$LEX" != "x:"; then + cat >conftest.l <<_ACEOF +%{ +#ifdef __cplusplus +extern "C" +#endif +int yywrap(void); +%} %% a { ECHO; } b { REJECT; } c { yymore (); } d { yyless (1); } e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */ - yyless ((input () != 0)); } +#ifdef __cplusplus + yyless ((yyinput () != 0)); +#else + yyless ((input () != 0)); +#endif + } f { unput (yytext[0]); } . { BEGIN INITIAL; } %% @@ -7615,101 +8736,205 @@ f { unput (yytext[0]); } extern char *yytext; #endif int +yywrap (void) +{ + return 1; +} +int main (void) { - return ! yylex () + ! yywrap (); + return ! yylex (); } _ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lex output file root" >&5 +printf %s "checking for lex output file root... " >&6; } +if test ${ac_cv_prog_lex_root+y} +then : + printf %s "(cached) " >&6 +else $as_nop + +ac_cv_prog_lex_root=unknown { { ac_try="$LEX conftest.l" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$LEX conftest.l") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5 -$as_echo_n "checking lex output file root... " >&6; } -if ${ac_cv_prog_lex_root+:} false; then : - $as_echo_n "(cached) " >&6 -else - + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && if test -f lex.yy.c; then ac_cv_prog_lex_root=lex.yy elif test -f lexyy.c; then ac_cv_prog_lex_root=lexyy -else - as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 -$as_echo "$ac_cv_prog_lex_root" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 +printf "%s\n" "$ac_cv_prog_lex_root" >&6; } +if test "$ac_cv_prog_lex_root" = unknown +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot find output from $LEX; giving up on $LEX" >&5 +printf "%s\n" "$as_me: WARNING: cannot find output from $LEX; giving up on $LEX" >&2;} + LEX=: LEXLIB= +fi LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root -if test -z "${LEXLIB+set}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5 -$as_echo_n "checking lex library... " >&6; } -if ${ac_cv_lib_lex+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${LEXLIB+y} +then : + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lex library" >&5 +printf %s "checking for lex library... " >&6; } +if test ${ac_cv_lib_lex+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + ac_save_LIBS="$LIBS" + ac_found=false + for ac_cv_lib_lex in 'none needed' -lfl -ll 'not found'; do + case $ac_cv_lib_lex in #( + 'none needed') : + ;; #( + 'not found') : + break ;; #( + *) : + LIBS="$ac_cv_lib_lex $ac_save_LIBS" ;; #( + *) : + ;; +esac - ac_save_LIBS=$LIBS - ac_cv_lib_lex='none needed' - for ac_lib in '' -lfl -ll; do - LIBS="$ac_lib $ac_save_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ `cat $LEX_OUTPUT_ROOT.c` _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_lex=$ac_lib +if ac_fn_c_try_link "$LINENO" +then : + ac_found=: fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - test "$ac_cv_lib_lex" != 'none needed' && break + if $ac_found; then + break + fi done - LIBS=$ac_save_LIBS + LIBS="$ac_save_LIBS" + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5 +printf "%s\n" "$ac_cv_lib_lex" >&6; } + if test "$ac_cv_lib_lex" = 'not found' +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: required lex library not found; giving up on $LEX" >&5 +printf "%s\n" "$as_me: WARNING: required lex library not found; giving up on $LEX" >&2;} + LEX=: LEXLIB= +elif test "$ac_cv_lib_lex" = 'none needed' +then : + LEXLIB='' +else $as_nop + LEXLIB=$ac_cv_lib_lex +fi + ac_save_LIBS="$LIBS" + LIBS= + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing yywrap" >&5 +printf %s "checking for library containing yywrap... " >&6; } +if test ${ac_cv_search_yywrap+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char yywrap (); +int +main (void) +{ +return yywrap (); + ; + return 0; +} +_ACEOF +for ac_lib in '' fl l +do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO" +then : + ac_cv_search_yywrap=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext + if test ${ac_cv_search_yywrap+y} +then : + break +fi +done +if test ${ac_cv_search_yywrap+y} +then : +else $as_nop + ac_cv_search_yywrap=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_yywrap" >&5 +printf "%s\n" "$ac_cv_search_yywrap" >&6; } +ac_res=$ac_cv_search_yywrap +if test "$ac_res" != no +then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + LEXLIB="$LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5 -$as_echo "$ac_cv_lib_lex" >&6; } - test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex + + LIBS="$ac_save_LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 -$as_echo_n "checking whether yytext is a pointer... " >&6; } -if ${ac_cv_prog_lex_yytext_pointer+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test "$LEX" != : +then : + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 +printf %s "checking whether yytext is a pointer... " >&6; } +if test ${ac_cv_prog_lex_yytext_pointer+y} +then : + printf %s "(cached) " >&6 +else $as_nop # POSIX says lex can declare yytext either as a pointer or an array; the # default is implementation-dependent. Figure out which it is, since # not all implementations provide the %pointer and %array declarations. ac_cv_prog_lex_yytext_pointer=no -ac_save_LIBS=$LIBS -LIBS="$LEXLIB $ac_save_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define YYTEXT_POINTER 1 `cat $LEX_OUTPUT_ROOT.c` _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_lex_yytext_pointer=yes fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_save_LIBS +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5 -$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5 +printf "%s\n" "$ac_cv_prog_lex_yytext_pointer" >&6; } if test $ac_cv_prog_lex_yytext_pointer = yes; then -$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h +printf "%s\n" "#define YYTEXT_POINTER 1" >>confdefs.h + +fi fi rm -f conftest.l $LEX_OUTPUT_ROOT.c @@ -7718,11 +8943,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else @@ -7730,11 +8956,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7745,11 +8975,11 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +printf "%s\n" "$RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7758,11 +8988,12 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else @@ -7770,11 +9001,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7785,11 +9020,11 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +printf "%s\n" "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -7797,8 +9032,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -7810,26 +9045,29 @@ fi # Checks for libraries. -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else + + # Make sure we can run config.sub. +$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +printf %s "checking build system type... " >&6; } +if test ${ac_cv_build+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 +ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -7848,21 +9086,22 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +printf %s "checking host system type... " >&6; } +if test ${ac_cv_host+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -7886,17 +9125,19 @@ ac_ext=f ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get verbose linking output from $F77" >&5 -$as_echo_n "checking how to get verbose linking output from $F77... " >&6; } -if ${ac_cv_prog_f77_v+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to get verbose linking output from $F77" >&5 +printf %s "checking how to get verbose linking output from $F77... " >&6; } +if test ${ac_cv_prog_f77_v+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat > conftest.$ac_ext <<_ACEOF program main end _ACEOF -if ac_fn_f77_try_compile "$LINENO"; then : +if ac_fn_f77_try_compile "$LINENO" +then : ac_cv_prog_f77_v= # Try some options frequently used verbose output for ac_verb in -v -verbose --verbose -V -\#\#\#; do @@ -7914,13 +9155,13 @@ ac_save_FFLAGS=$FFLAGS FFLAGS="$FFLAGS $ac_verb" eval "set x $ac_link" shift -$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: $*" >&5 # gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH, # LIBRARY_PATH; skip all such settings. ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | sed '/^Driving:/d; /^Configured with:/d; '"/^[_$as_cr_Letters][_$as_cr_alnum]*=/d"` -$as_echo "$ac_f77_v_output" >&5 +printf "%s\n" "$ac_f77_v_output" >&5 FFLAGS=$ac_save_FFLAGS rm -rf conftest* @@ -7987,23 +9228,24 @@ esac done done if test -z "$ac_cv_prog_f77_v"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine how to obtain linking information from $F77" >&5 -$as_echo "$as_me: WARNING: cannot determine how to obtain linking information from $F77" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine how to obtain linking information from $F77" >&5 +printf "%s\n" "$as_me: WARNING: cannot determine how to obtain linking information from $F77" >&2;} fi -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compilation failed" >&5 -$as_echo "$as_me: WARNING: compilation failed" >&2;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: compilation failed" >&5 +printf "%s\n" "$as_me: WARNING: compilation failed" >&2;} fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_v" >&5 -$as_echo "$ac_cv_prog_f77_v" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 libraries of $F77" >&5 -$as_echo_n "checking for Fortran 77 libraries of $F77... " >&6; } -if ${ac_cv_f77_libs+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_v" >&5 +printf "%s\n" "$ac_cv_prog_f77_v" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 libraries of $F77" >&5 +printf %s "checking for Fortran 77 libraries of $F77... " >&6; } +if test ${ac_cv_f77_libs+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "x$FLIBS" != "x"; then ac_cv_f77_libs="$FLIBS" # Let the user override the test. else @@ -8022,13 +9264,13 @@ ac_save_FFLAGS=$FFLAGS FFLAGS="$FFLAGS $ac_cv_prog_f77_v" eval "set x $ac_link" shift -$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: $*" >&5 # gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH, # LIBRARY_PATH; skip all such settings. ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | sed '/^Driving:/d; /^Configured with:/d; '"/^[_$as_cr_Letters][_$as_cr_alnum]*=/d"` -$as_echo "$ac_f77_v_output" >&5 +printf "%s\n" "$ac_f77_v_output" >&5 FFLAGS=$ac_save_FFLAGS rm -rf conftest* @@ -8105,9 +9347,10 @@ while test $# != 1; do fi done - if test x"$ac_exists" = xtrue; then : + if test x"$ac_exists" = xtrue +then : -else +else $as_nop ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" fi ;; @@ -8120,9 +9363,10 @@ fi fi done - if test x"$ac_exists" = xtrue; then : + if test x"$ac_exists" = xtrue +then : -else +else $as_nop if test "$ac_compiler_gnu" = yes; then for ac_link_opt in $ac_arg; do ac_cv_f77_libs="$ac_cv_f77_libs -Xlinker $ac_link_opt" @@ -8137,9 +9381,24 @@ fi |-LANG:=* | -LIST:* | -LNO:* | -link) ;; -lkernel32) + # Ignore this library only on Windows-like systems. case $host_os in - *cygwin*) ;; - *) ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" + cygwin* | msys* ) ;; + *) + ac_exists=false + for ac_i in $ac_cv_f77_libs; do + if test x"$ac_arg" = x"$ac_i"; then + ac_exists=true + break + fi + done + + if test x"$ac_exists" = xtrue +then : + +else $as_nop + ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" +fi ;; esac ;; @@ -8157,7 +9416,7 @@ fi esac ;; -YP,*) - for ac_j in `$as_echo "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do + for ac_j in `printf "%s\n" "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do ac_exists=false for ac_i in $ac_cv_f77_libs; do if test x"$ac_j" = x"$ac_i"; then @@ -8166,9 +9425,10 @@ fi fi done - if test x"$ac_exists" = xtrue; then : + if test x"$ac_exists" = xtrue +then : -else +else $as_nop ac_arg="$ac_arg $ac_j" ac_cv_f77_libs="$ac_cv_f77_libs $ac_j" fi @@ -8180,188 +9440,50 @@ fi if test x"$ac_arg" = x"$ac_i"; then ac_exists=true break - fi - done - - if test x"$ac_exists" = xtrue; then : - -else - ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" -fi - ;; - -zallextract*| -zdefaultextract) - ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" - ;; - # Ignore everything else. - esac -done -# restore positional arguments -set X $ac_save_positional; shift - -# We only consider "LD_RUN_PATH" on Solaris systems. If this is seen, -# then we insist that the "run path" must be an absolute path (i.e. it -# must begin with a "/"). -case `(uname -sr) 2>/dev/null` in - "SunOS 5"*) - ac_ld_run_path=`$as_echo "$ac_f77_v_output" | - sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'` - test "x$ac_ld_run_path" != x && - if test "$ac_compiler_gnu" = yes; then - for ac_link_opt in $ac_ld_run_path; do - ac_cv_f77_libs="$ac_cv_f77_libs -Xlinker $ac_link_opt" - done -else - ac_cv_f77_libs="$ac_cv_f77_libs $ac_ld_run_path" -fi - ;; -esac -fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_libs" >&5 -$as_echo "$ac_cv_f77_libs" >&6; } -FLIBS="$ac_cv_f77_libs" - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -# Checks for header files. - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi + fi + done - done - ac_cv_prog_CPP=$CPP + if test x"$ac_exists" = xtrue +then : +else $as_nop + ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : + ;; + -zallextract*| -zdefaultextract) + ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" + ;; + -mllvm) ${2+shift};; # Defend against 'clang -mllvm -loopopt=0'. + # Ignore everything else. + esac +done +# restore positional arguments +set X $ac_save_positional; shift +# We only consider "LD_RUN_PATH" on Solaris systems. If this is seen, +# then we insist that the "run path" must be an absolute path (i.e. it +# must begin with a "/"). +case `(uname -sr) 2>/dev/null` in + "SunOS 5"*) + ac_ld_run_path=`printf "%s\n" "$ac_f77_v_output" | + sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'` + test "x$ac_ld_run_path" != x && + if test "$ac_compiler_gnu" = yes; then + for ac_link_opt in $ac_ld_run_path; do + ac_cv_f77_libs="$ac_cv_f77_libs -Xlinker $ac_link_opt" + done else - # Broken: fails on valid input. -continue + ac_cv_f77_libs="$ac_cv_f77_libs $ac_ld_run_path" fi -rm -f conftest.err conftest.i conftest.$ac_ext + ;; +esac +fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x" - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_libs" >&5 +printf "%s\n" "$ac_cv_f77_libs" >&6; } +FLIBS="$ac_cv_f77_libs" -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -8370,394 +9492,277 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +# Checks for header files. + +ac_header= ac_cache= +for ac_item in $ac_header_c_list do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - +done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h -else - ac_cv_header_stdc=no fi -rm -f conftest* +ac_fn_c_check_header_compile "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default" +if test "x$ac_cv_header_errno_h" = xyes +then : + printf "%s\n" "#define HAVE_ERRNO_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default" +if test "x$ac_cv_header_fcntl_h" = xyes +then : + printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no fi -rm -f conftest* +ac_fn_c_check_header_compile "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" +if test "x$ac_cv_header_inttypes_h" = xyes +then : + printf "%s\n" "#define HAVE_INTTYPES_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default" +if test "x$ac_cv_header_limits_h" = xyes +then : + printf "%s\n" "#define HAVE_LIMITS_H 1" >>confdefs.h -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +ac_fn_c_check_header_compile "$LINENO" "memory.h" "ac_cv_header_memory_h" "$ac_includes_default" +if test "x$ac_cv_header_memory_h" = xyes +then : + printf "%s\n" "#define HAVE_MEMORY_H 1" >>confdefs.h + fi +ac_fn_c_check_header_compile "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default" +if test "x$ac_cv_header_stddef_h" = xyes +then : + printf "%s\n" "#define HAVE_STDDEF_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes +then : + printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then +ac_fn_c_check_header_compile "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" +if test "x$ac_cv_header_string_h" = xyes +then : + printf "%s\n" "#define HAVE_STRING_H 1" >>confdefs.h -$as_echo "#define STDC_HEADERS 1" >>confdefs.h +fi +ac_fn_c_check_header_compile "$LINENO" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default" +if test "x$ac_cv_header_strings_h" = xyes +then : + printf "%s\n" "#define HAVE_STRINGS_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "sys/file.h" "ac_cv_header_sys_file_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_file_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_FILE_H 1" >>confdefs.h -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +fi +ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_param_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" +if test "x$ac_cv_header_unistd_h" = xyes +then : + printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h -done +fi -for ac_header in errno.h fcntl.h inttypes.h limits.h memory.h stddef.h stdlib.h string.h strings.h sys/file.h sys/param.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +# Checks for typedefs, structures, and compiler characteristics. -fi +ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" +if test "x$ac_cv_type__Bool" = xyes +then : -done +printf "%s\n" "#define HAVE__BOOL 1" >>confdefs.h -# Checks for typedefs, structures, and compiler characteristics. +fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 -$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } -if ${ac_cv_header_stdbool_h+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 +printf %s "checking for stdbool.h that conforms to C99... " >&6; } +if test ${ac_cv_header_stdbool_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include - #include - #ifndef bool - "error: bool is not defined" - #endif - #ifndef false - "error: false is not defined" - #endif - #if false - "error: false is not 0" + #ifndef __bool_true_false_are_defined + #error "__bool_true_false_are_defined is not defined" #endif - #ifndef true - "error: true is not defined" + char a[__bool_true_false_are_defined == 1 ? 1 : -1]; + + /* Regardless of whether this is C++ or "_Bool" is a + valid type name, "true" and "false" should be usable + in #if expressions and integer constant expressions, + and "bool" should be a valid type name. */ + + #if !true + #error "'true' is not true" #endif #if true != 1 - "error: true is not 1" + #error "'true' is not equal to 1" #endif - #ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" + char b[true == 1 ? 1 : -1]; + char c[true]; + + #if false + #error "'false' is not false" #endif + #if false != 0 + #error "'false' is not equal to 0" + #endif + char d[false == 0 ? 1 : -1]; + + enum { e = false, f = true, g = false * true, h = true * 256 }; + + char i[(bool) 0.5 == true ? 1 : -1]; + char j[(bool) 0.0 == false ? 1 : -1]; + char k[sizeof (bool) > 0 ? 1 : -1]; + + struct sb { bool s: 1; bool t; } s; + char l[sizeof s.t > 0 ? 1 : -1]; - struct s { _Bool s: 1; _Bool t; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - /* See body of main program for 'e'. */ - char f[(_Bool) 0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (_Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; /* The following fails for HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - _Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; + bool m[h]; + char n[sizeof m == h * sizeof m[0] ? 1 : -1]; + char o[-1 - (bool) 0 < 0 ? 1 : -1]; /* Catch a bug in an HP-UX C compiler. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + https://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html */ - _Bool q = true; - _Bool *pq = &q; + bool p = true; + bool *pp = &p; + + /* C 1999 specifies that bool, true, and false are to be + macros, but C++ 2011 and later overrule this. */ + #if __cplusplus < 201103 + #ifndef bool + #error "bool is not defined" + #endif + #ifndef false + #error "false is not defined" + #endif + #ifndef true + #error "true is not defined" + #endif + #endif + + /* If _Bool is available, repeat with it all the tests + above that used bool. */ + #ifdef HAVE__BOOL + struct sB { _Bool s: 1; _Bool t; } t; + + char q[(_Bool) 0.5 == true ? 1 : -1]; + char r[(_Bool) 0.0 == false ? 1 : -1]; + char u[sizeof (_Bool) > 0 ? 1 : -1]; + char v[sizeof t.t > 0 ? 1 : -1]; + + _Bool w[h]; + char x[sizeof m == h * sizeof m[0] ? 1 : -1]; + char y[-1 - (_Bool) 0 < 0 ? 1 : -1]; + _Bool z = true; + _Bool *pz = &p; + #endif int -main () +main (void) { - bool e = &s; - *pq |= q; - *pq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq); + bool ps = &s; + *pp |= p; + *pp |= ! p; + + #ifdef HAVE__BOOL + _Bool pt = &t; + *pz |= z; + *pz |= ! z; + #endif + + /* Refer to every declared value, so they cannot be + discarded as unused. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !j + !k + + !l + !m + !n + !o + !p + !pp + !ps + #ifdef HAVE__BOOL + + !q + !r + !u + !v + !w + !x + !y + !z + !pt + #endif + ); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_header_stdbool_h=yes -else +else $as_nop ac_cv_header_stdbool_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 -$as_echo "$ac_cv_header_stdbool_h" >&6; } - ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" -if test "x$ac_cv_type__Bool" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE__BOOL 1 -_ACEOF - - +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 +printf "%s\n" "$ac_cv_header_stdbool_h" >&6; } - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if ${ac_cv_c_inline+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +printf %s "checking for inline... " >&6; } +if test ${ac_cv_c_inline+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __cplusplus typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } +static $ac_kw foo_t static_foo (void) {return 0; } +$ac_kw foo_t foo (void) {return 0; } #endif _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_inline=$ac_kw fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext test "$ac_cv_c_inline" != no && break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +printf "%s\n" "$ac_cv_c_inline" >&6; } case $ac_cv_c_inline in inline | yes) ;; @@ -8779,9 +9784,7 @@ case $ac_cv_c_int16_t in #( no|yes) ;; #( *) -cat >>confdefs.h <<_ACEOF -#define int16_t $ac_cv_c_int16_t -_ACEOF +printf "%s\n" "#define int16_t $ac_cv_c_int16_t" >>confdefs.h ;; esac @@ -8790,9 +9793,7 @@ case $ac_cv_c_int32_t in #( no|yes) ;; #( *) -cat >>confdefs.h <<_ACEOF -#define int32_t $ac_cv_c_int32_t -_ACEOF +printf "%s\n" "#define int32_t $ac_cv_c_int32_t" >>confdefs.h ;; esac @@ -8801,31 +9802,27 @@ case $ac_cv_c_int8_t in #( no|yes) ;; #( *) -cat >>confdefs.h <<_ACEOF -#define int8_t $ac_cv_c_int8_t -_ACEOF +printf "%s\n" "#define int8_t $ac_cv_c_int8_t" >>confdefs.h ;; esac ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" -if test "x$ac_cv_type_off_t" = xyes; then : +if test "x$ac_cv_type_off_t" = xyes +then : -else +else $as_nop -cat >>confdefs.h <<_ACEOF -#define off_t long int -_ACEOF +printf "%s\n" "#define off_t long int" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = xyes; then : +if test "x$ac_cv_type_size_t" = xyes +then : -else +else $as_nop -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF +printf "%s\n" "#define size_t unsigned int" >>confdefs.h fi @@ -8835,9 +9832,7 @@ case $ac_cv_c_uint16_t in #( *) -cat >>confdefs.h <<_ACEOF -#define uint16_t $ac_cv_c_uint16_t -_ACEOF +printf "%s\n" "#define uint16_t $ac_cv_c_uint16_t" >>confdefs.h ;; esac @@ -8846,12 +9841,10 @@ case $ac_cv_c_uint32_t in #( no|yes) ;; #( *) -$as_echo "#define _UINT32_T 1" >>confdefs.h +printf "%s\n" "#define _UINT32_T 1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define uint32_t $ac_cv_c_uint32_t -_ACEOF +printf "%s\n" "#define uint32_t $ac_cv_c_uint32_t" >>confdefs.h ;; esac @@ -8860,44 +9853,44 @@ case $ac_cv_c_uint8_t in #( no|yes) ;; #( *) -$as_echo "#define _UINT8_T 1" >>confdefs.h +printf "%s\n" "#define _UINT8_T 1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define uint8_t $ac_cv_c_uint8_t -_ACEOF +printf "%s\n" "#define uint8_t $ac_cv_c_uint8_t" >>confdefs.h ;; esac # Checks for library functions. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 -$as_echo_n "checking for error_at_line... " >&6; } -if ${ac_cv_lib_error_at_line+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 +printf %s "checking for error_at_line... " >&6; } +if test ${ac_cv_lib_error_at_line+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { error_at_line (0, 0, "", 0, "an error occurred"); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_error_at_line=yes -else +else $as_nop ac_cv_lib_error_at_line=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 -$as_echo "$ac_cv_lib_error_at_line" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 +printf "%s\n" "$ac_cv_lib_error_at_line" >&6; } if test $ac_cv_lib_error_at_line = no; then case " $LIBOBJS " in *" error.$ac_objext "* ) ;; @@ -8909,17 +9902,114 @@ fi # AC_FUNC_MALLOC # AC_FUNC_REALLOC -for ac_func in dup2 floor gethostname memset mkdir pow regcomp select setenv sqrt strcasecmp strchr strcspn strerror strncasecmp strrchr strstr isatty -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_func "$LINENO" "dup2" "ac_cv_func_dup2" +if test "x$ac_cv_func_dup2" = xyes +then : + printf "%s\n" "#define HAVE_DUP2 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "floor" "ac_cv_func_floor" +if test "x$ac_cv_func_floor" = xyes +then : + printf "%s\n" "#define HAVE_FLOOR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "gethostname" "ac_cv_func_gethostname" +if test "x$ac_cv_func_gethostname" = xyes +then : + printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "memset" "ac_cv_func_memset" +if test "x$ac_cv_func_memset" = xyes +then : + printf "%s\n" "#define HAVE_MEMSET 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "mkdir" "ac_cv_func_mkdir" +if test "x$ac_cv_func_mkdir" = xyes +then : + printf "%s\n" "#define HAVE_MKDIR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow" +if test "x$ac_cv_func_pow" = xyes +then : + printf "%s\n" "#define HAVE_POW 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "regcomp" "ac_cv_func_regcomp" +if test "x$ac_cv_func_regcomp" = xyes +then : + printf "%s\n" "#define HAVE_REGCOMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "select" "ac_cv_func_select" +if test "x$ac_cv_func_select" = xyes +then : + printf "%s\n" "#define HAVE_SELECT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setenv" "ac_cv_func_setenv" +if test "x$ac_cv_func_setenv" = xyes +then : + printf "%s\n" "#define HAVE_SETENV 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sqrt" "ac_cv_func_sqrt" +if test "x$ac_cv_func_sqrt" = xyes +then : + printf "%s\n" "#define HAVE_SQRT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" +if test "x$ac_cv_func_strcasecmp" = xyes +then : + printf "%s\n" "#define HAVE_STRCASECMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strchr" "ac_cv_func_strchr" +if test "x$ac_cv_func_strchr" = xyes +then : + printf "%s\n" "#define HAVE_STRCHR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strcspn" "ac_cv_func_strcspn" +if test "x$ac_cv_func_strcspn" = xyes +then : + printf "%s\n" "#define HAVE_STRCSPN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror" +if test "x$ac_cv_func_strerror" = xyes +then : + printf "%s\n" "#define HAVE_STRERROR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp" +if test "x$ac_cv_func_strncasecmp" = xyes +then : + printf "%s\n" "#define HAVE_STRNCASECMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strrchr" "ac_cv_func_strrchr" +if test "x$ac_cv_func_strrchr" = xyes +then : + printf "%s\n" "#define HAVE_STRRCHR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr" +if test "x$ac_cv_func_strstr" = xyes +then : + printf "%s\n" "#define HAVE_STRSTR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "isatty" "ac_cv_func_isatty" +if test "x$ac_cv_func_isatty" = xyes +then : + printf "%s\n" "#define HAVE_ISATTY 1" >>confdefs.h fi -done @@ -9021,8 +10111,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -9052,15 +10142,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -9074,8 +10164,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;} fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -9092,7 +10182,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -9103,14 +10193,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 -$as_echo_n "checking that generated files are newer than configure... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +printf %s "checking that generated files are newer than configure... " >&6; } if test -n "$am_sleep_pid"; then # Hide warnings about reused PIDs. wait $am_sleep_pid 2>/dev/null fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 -$as_echo "done" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 +printf "%s\n" "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -9284,8 +10374,8 @@ fi ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -9308,14 +10398,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -9325,46 +10417,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -9373,13 +10465,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -9388,8 +10473,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -9401,30 +10490,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -9437,13 +10506,14 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -9470,18 +10540,20 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset + # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -9493,12 +10565,13 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -9529,7 +10602,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -9551,6 +10624,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -9564,6 +10641,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -9605,7 +10688,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -9614,7 +10697,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -9677,7 +10760,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by MET $as_me development, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -9740,14 +10823,16 @@ Report bugs to . MET home page: ." _ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ MET config.status development -configured by $0, generated by GNU Autoconf 2.69, +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -9787,15 +10872,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -9803,7 +10888,7 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -9812,7 +10897,7 @@ do as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -9840,7 +10925,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -9854,7 +10939,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF @@ -10021,9 +11106,9 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files + test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers + test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree @@ -10359,7 +11444,7 @@ do esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -10367,17 +11452,17 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -10394,7 +11479,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -10418,9 +11503,9 @@ $as_echo X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -10482,8 +11567,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -10527,9 +11612,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -10545,20 +11630,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} # if test x"$ac_file" != x-; then { - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi @@ -10578,7 +11663,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$_am_arg" : 'X\(//\)[^/]' \| \ X"$_am_arg" : 'X\(//\)$' \| \ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$_am_arg" | +printf "%s\n" X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -10598,8 +11683,8 @@ $as_echo X"$_am_arg" | s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} + :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +printf "%s\n" "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -10625,7 +11710,7 @@ esac for am_mf do # Strip MF so we end up with the name of the file. - am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile which includes # dependency-tracking related rules and includes. # Grep'ing the whole file directly is not great: AIX grep has a line @@ -10637,7 +11722,7 @@ $as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$am_mf" : 'X\(//\)[^/]' \| \ X"$am_mf" : 'X\(//\)$' \| \ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$am_mf" | +printf "%s\n" X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -10659,7 +11744,7 @@ $as_echo X"$am_mf" | $as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ X"$am_mf" : 'X\(//\)$' \| \ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$am_mf" | +printf "%s\n" X/"$am_mf" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -10684,10 +11769,12 @@ $as_echo X/"$am_mf" | (exit $ac_status); } || am_rc=$? done if test $am_rc -ne 0; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } @@ -10733,7 +11820,8 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + diff --git a/data/Makefile.in b/data/Makefile.in index f28957b49b..01dd007877 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,8 +179,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -220,8 +218,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -231,13 +230,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -537,7 +535,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/climo/Makefile.in b/data/climo/Makefile.in index 5e3aaa588f..0897440d66 100644 --- a/data/climo/Makefile.in +++ b/data/climo/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -149,8 +149,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -190,8 +188,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -201,13 +200,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -468,7 +466,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/climo/seeps/Makefile.in b/data/climo/seeps/Makefile.in index fcb81b5b17..85c01467c7 100644 --- a/data/climo/seeps/Makefile.in +++ b/data/climo/seeps/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,8 +160,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -171,13 +172,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -369,7 +369,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/colortables/Makefile.in b/data/colortables/Makefile.in index 57fc8c2c23..8bcd9da5b7 100644 --- a/data/colortables/Makefile.in +++ b/data/colortables/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,8 +179,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -220,8 +218,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -231,13 +230,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -531,7 +529,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/colortables/NCL_colortables/Makefile.in b/data/colortables/NCL_colortables/Makefile.in index 11f9f07af9..f17a76394c 100644 --- a/data/colortables/NCL_colortables/Makefile.in +++ b/data/colortables/NCL_colortables/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,8 +160,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -171,13 +172,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -638,7 +638,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/config/Makefile.in b/data/config/Makefile.in index 06694bf28b..38bb655e12 100644 --- a/data/config/Makefile.in +++ b/data/config/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,8 +160,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -171,13 +172,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -400,7 +400,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/map/Makefile.in b/data/map/Makefile.in index 70a82d8136..17604ea58f 100644 --- a/data/map/Makefile.in +++ b/data/map/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,10 +179,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) -am__DIST_COMMON = $(srcdir)/Makefile.in +am__DIST_COMMON = $(srcdir)/Makefile.in README.md DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -220,8 +218,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -231,13 +230,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -521,7 +519,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/map/admin_by_country/Makefile.in b/data/map/admin_by_country/Makefile.in index 8f6e5beaab..e74eb8080a 100644 --- a/data/map/admin_by_country/Makefile.in +++ b/data/map/admin_by_country/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,8 +160,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -171,13 +172,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -367,7 +367,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/poly/HMT_masks/Makefile.in b/data/poly/HMT_masks/Makefile.in index 800a5866b5..2652e1ca80 100644 --- a/data/poly/HMT_masks/Makefile.in +++ b/data/poly/HMT_masks/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,8 +160,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -171,13 +172,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -374,7 +374,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/poly/Makefile.in b/data/poly/Makefile.in index 71fea185ee..19f71f1aaf 100644 --- a/data/poly/Makefile.in +++ b/data/poly/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,8 +179,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -220,8 +218,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -231,13 +230,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -556,7 +554,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/poly/NCEP_masks/Makefile.in b/data/poly/NCEP_masks/Makefile.in index ae30b73cad..621d989052 100644 --- a/data/poly/NCEP_masks/Makefile.in +++ b/data/poly/NCEP_masks/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,8 +160,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -171,13 +172,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -402,7 +402,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/ps/Makefile.in b/data/ps/Makefile.in index abcbcb1aaf..880648b28f 100644 --- a/data/ps/Makefile.in +++ b/data/ps/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,8 +160,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -171,13 +172,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -402,7 +402,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/table_files/Makefile.in b/data/table_files/Makefile.in index 3c90e72952..5f9672622d 100644 --- a/data/table_files/Makefile.in +++ b/data/table_files/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,8 +160,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -171,13 +172,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -447,7 +447,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/tc_data/Makefile.in b/data/tc_data/Makefile.in index f17e75c336..7d9f8a5d3b 100644 --- a/data/tc_data/Makefile.in +++ b/data/tc_data/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,8 +160,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -171,13 +172,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -375,7 +375,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/depcomp b/depcomp index 65cbf7093a..715e34311e 100755 --- a/depcomp +++ b/depcomp @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/install-sh b/install-sh index 8175c640fe..ec298b5374 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -69,6 +69,11 @@ posix_mkdir= # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -99,18 +104,28 @@ Options: --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake@gnu.org. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,8 +152,13 @@ while test $# -ne 0; do -o) chowncmd="$chownprog $2" shift;; + -p) cpprog="$cpprog -p";; + -s) stripcmd=$stripprog;; + -S) backupsuffix="$2" + shift;; + -t) is_target_a_directory=always dst_arg=$2 @@ -255,6 +275,10 @@ do dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -301,22 +325,6 @@ do if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - # With -d, create the new directory with the user-specified mode. # Otherwise, rely on $mkdir_umask. if test -n "$dir_arg"; then @@ -326,52 +334,49 @@ do fi posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. - if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; esac if @@ -382,7 +387,7 @@ do then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. @@ -411,7 +416,7 @@ do prefixes= else if $posix_mkdir; then - (umask=$mkdir_umask && + (umask $mkdir_umask && $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 @@ -451,7 +456,18 @@ do trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -477,6 +493,13 @@ do then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -491,9 +514,9 @@ do # file should still install successfully. { test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || + $doit $rmcmd "$dst" 2>/dev/null || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } } || { echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 diff --git a/internal/test_util/Makefile.in b/internal/test_util/Makefile.in index 14047af2d0..9acbcf6787 100644 --- a/internal/test_util/Makefile.in +++ b/internal/test_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -149,8 +149,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -190,8 +188,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -201,13 +200,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -470,7 +468,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/basic/Makefile.in b/internal/test_util/basic/Makefile.in index ce2b774b89..2137a410fe 100644 --- a/internal/test_util/basic/Makefile.in +++ b/internal/test_util/basic/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -149,8 +149,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -190,8 +188,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -201,13 +200,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -470,7 +468,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/basic/vx_config/Makefile.in b/internal/test_util/basic/vx_config/Makefile.in index fe650070e1..912b046ff4 100644 --- a/internal/test_util/basic/vx_config/Makefile.in +++ b/internal/test_util/basic/vx_config/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -200,8 +200,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -215,8 +213,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -226,13 +225,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -605,7 +603,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/basic/vx_log/Makefile.in b/internal/test_util/basic/vx_log/Makefile.in index 069844e9d4..b5f512de08 100644 --- a/internal/test_util/basic/vx_log/Makefile.in +++ b/internal/test_util/basic/vx_log/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -169,8 +169,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -184,8 +182,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -195,13 +194,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -492,7 +490,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/basic/vx_util/Makefile.in b/internal/test_util/basic/vx_util/Makefile.in index 44774d077e..6c6d4382ac 100644 --- a/internal/test_util/basic/vx_util/Makefile.in +++ b/internal/test_util/basic/vx_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -205,8 +205,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -220,8 +218,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -231,13 +230,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -627,7 +625,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/Makefile.in b/internal/test_util/libcode/Makefile.in index dcc04f5782..c2211404bb 100644 --- a/internal/test_util/libcode/Makefile.in +++ b/internal/test_util/libcode/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -149,8 +149,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -190,8 +188,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -201,13 +200,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -481,7 +479,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_data2d/Makefile.in b/internal/test_util/libcode/vx_data2d/Makefile.in index 1a9d7a5ac3..34f3c48e7f 100644 --- a/internal/test_util/libcode/vx_data2d/Makefile.in +++ b/internal/test_util/libcode/vx_data2d/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -174,8 +174,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -189,8 +187,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -200,13 +199,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -518,7 +516,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_data2d_factory/Makefile.in b/internal/test_util/libcode/vx_data2d_factory/Makefile.in index b9a5504200..bda681b2a7 100644 --- a/internal/test_util/libcode/vx_data2d_factory/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_factory/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -171,8 +171,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -186,8 +184,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -197,13 +196,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -524,7 +522,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_data2d_grib/Makefile.in b/internal/test_util/libcode/vx_data2d_grib/Makefile.in index 8d0575e2ac..69bffaab0b 100644 --- a/internal/test_util/libcode/vx_data2d_grib/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_grib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -165,8 +165,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -180,8 +178,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -191,13 +190,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -477,7 +475,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in index 1c3276e1db..1a9ea367fb 100644 --- a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -166,8 +166,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -181,8 +179,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -192,13 +191,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -479,7 +477,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in index 98e7a40e4f..cfe73a3afd 100644 --- a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -164,8 +164,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -179,8 +177,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -190,13 +189,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -477,7 +475,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_geodesy/Makefile.in b/internal/test_util/libcode/vx_geodesy/Makefile.in index 5c07f60017..c1c9f77834 100644 --- a/internal/test_util/libcode/vx_geodesy/Makefile.in +++ b/internal/test_util/libcode/vx_geodesy/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -163,8 +163,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -178,8 +176,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -189,13 +188,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -465,7 +463,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_grid/Makefile.in b/internal/test_util/libcode/vx_grid/Makefile.in index 209554b83e..8605277488 100644 --- a/internal/test_util/libcode/vx_grid/Makefile.in +++ b/internal/test_util/libcode/vx_grid/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -164,8 +164,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -179,8 +177,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -190,13 +189,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -473,7 +471,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_nc_util/Makefile.in b/internal/test_util/libcode/vx_nc_util/Makefile.in index db82a5f634..af0455eab3 100644 --- a/internal/test_util/libcode/vx_nc_util/Makefile.in +++ b/internal/test_util/libcode/vx_nc_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -168,8 +168,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,8 +181,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -194,13 +193,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -497,7 +495,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_physics/Makefile.in b/internal/test_util/libcode/vx_physics/Makefile.in index 7968a41c33..79622fa275 100644 --- a/internal/test_util/libcode/vx_physics/Makefile.in +++ b/internal/test_util/libcode/vx_physics/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -163,8 +163,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -178,8 +176,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -189,13 +188,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -468,7 +466,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_plot_util/Makefile.in b/internal/test_util/libcode/vx_plot_util/Makefile.in index b912fe44ae..986edea8a1 100644 --- a/internal/test_util/libcode/vx_plot_util/Makefile.in +++ b/internal/test_util/libcode/vx_plot_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -164,8 +164,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -179,8 +177,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -190,13 +189,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -466,7 +464,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_ps/Makefile.in b/internal/test_util/libcode/vx_ps/Makefile.in index 4d856d8a3b..1e2a1c7456 100644 --- a/internal/test_util/libcode/vx_ps/Makefile.in +++ b/internal/test_util/libcode/vx_ps/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -163,8 +163,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -178,8 +176,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -189,13 +188,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -468,7 +466,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_series_data/Makefile.in b/internal/test_util/libcode/vx_series_data/Makefile.in index 86a55fafbc..3c58108554 100644 --- a/internal/test_util/libcode/vx_series_data/Makefile.in +++ b/internal/test_util/libcode/vx_series_data/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -165,8 +165,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -180,8 +178,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -191,13 +190,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -481,7 +479,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_solar/Makefile.in b/internal/test_util/libcode/vx_solar/Makefile.in index e82111c3f1..5e00e714be 100644 --- a/internal/test_util/libcode/vx_solar/Makefile.in +++ b/internal/test_util/libcode/vx_solar/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -163,8 +163,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -178,8 +176,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -189,13 +188,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -467,7 +465,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_tc_util/Makefile.in b/internal/test_util/libcode/vx_tc_util/Makefile.in index e834361439..27469fd0cc 100644 --- a/internal/test_util/libcode/vx_tc_util/Makefile.in +++ b/internal/test_util/libcode/vx_tc_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -173,8 +173,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -188,8 +186,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -199,13 +198,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -557,7 +555,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/tools/Makefile.in b/internal/test_util/tools/Makefile.in index 4a8f44754e..cb06354cd2 100644 --- a/internal/test_util/tools/Makefile.in +++ b/internal/test_util/tools/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -149,8 +149,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -190,8 +188,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -201,13 +200,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -467,7 +465,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/tools/other/Makefile.in b/internal/test_util/tools/other/Makefile.in index 84f48b3d67..d69379b910 100644 --- a/internal/test_util/tools/other/Makefile.in +++ b/internal/test_util/tools/other/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -149,8 +149,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -190,8 +188,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -201,13 +200,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -467,7 +465,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/tools/other/mode_time_domain/Makefile.in b/internal/test_util/tools/other/mode_time_domain/Makefile.in index afc54c9477..808f763421 100644 --- a/internal/test_util/tools/other/mode_time_domain/Makefile.in +++ b/internal/test_util/tools/other/mode_time_domain/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -189,8 +189,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -204,8 +202,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -215,13 +214,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -545,7 +543,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/missing b/missing index 625aeb1189..1fe1611f18 100755 --- a/missing +++ b/missing @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff --git a/scripts/Rscripts/Makefile.in b/scripts/Rscripts/Makefile.in index ed21e28921..f93285ac11 100644 --- a/scripts/Rscripts/Makefile.in +++ b/scripts/Rscripts/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,8 +179,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -220,8 +218,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -231,13 +230,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -533,7 +531,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/scripts/Rscripts/include/Makefile.in b/scripts/Rscripts/include/Makefile.in index 54b8a7df26..7c544e9cfa 100644 --- a/scripts/Rscripts/include/Makefile.in +++ b/scripts/Rscripts/include/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,8 +160,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -171,13 +172,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -373,7 +373,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/scripts/python/Makefile.in b/scripts/python/Makefile.in index a5ab9e9942..efe0b382a2 100644 --- a/scripts/python/Makefile.in +++ b/scripts/python/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -151,8 +151,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -192,8 +190,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -203,13 +202,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -476,7 +474,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/scripts/python/examples/Makefile.in b/scripts/python/examples/Makefile.in index 58d89aa6e1..a9f2a8db6d 100644 --- a/scripts/python/examples/Makefile.in +++ b/scripts/python/examples/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -162,8 +162,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -173,13 +174,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -377,7 +377,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/scripts/python/met/Makefile.in b/scripts/python/met/Makefile.in index cc1850d74f..490d264ca8 100644 --- a/scripts/python/met/Makefile.in +++ b/scripts/python/met/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -162,8 +162,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -173,13 +174,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -374,7 +374,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/scripts/python/pyembed/Makefile.in b/scripts/python/pyembed/Makefile.in index 96d65d1711..20ee6e37a6 100644 --- a/scripts/python/pyembed/Makefile.in +++ b/scripts/python/pyembed/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,8 +179,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -220,8 +218,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -231,13 +230,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -533,7 +531,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/scripts/python/tc_diag/Makefile.in b/scripts/python/tc_diag/Makefile.in index bf65ff232b..06f83a422c 100644 --- a/scripts/python/tc_diag/Makefile.in +++ b/scripts/python/tc_diag/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -162,8 +162,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -173,13 +174,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -371,7 +371,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/scripts/python/utility/Makefile.in b/scripts/python/utility/Makefile.in index 44ef459c1e..fdeda94c3a 100644 --- a/scripts/python/utility/Makefile.in +++ b/scripts/python/utility/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -162,8 +162,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -173,13 +174,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -372,7 +372,6 @@ ctags CTAGS: cscope cscopelist: - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/Makefile.in b/src/Makefile.in index 40b835daa5..f4f8e40a3e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -149,8 +149,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -190,8 +188,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -201,13 +200,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -470,7 +468,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/basic/Makefile.in b/src/basic/Makefile.in index 398d571c04..95eaedfe15 100644 --- a/src/basic/Makefile.in +++ b/src/basic/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -150,8 +150,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = vx_log vx_cal enum_to_string vx_math vx_util \ vx_util_math vx_config am__DIST_COMMON = $(srcdir)/Makefile.in @@ -192,8 +190,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -203,13 +202,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -470,7 +468,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/basic/enum_to_string/Makefile.in b/src/basic/enum_to_string/Makefile.in index 1d65d58f27..d16174451b 100644 --- a/src/basic/enum_to_string/Makefile.in +++ b/src/basic/enum_to_string/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -193,8 +193,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ $(top_srcdir)/ylwrap enum_parser.cc DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -209,8 +207,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -220,13 +219,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -625,7 +623,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/basic/vx_cal/Makefile.in b/src/basic/vx_cal/Makefile.in index 3c5e4acf66..0d3317fbf5 100644 --- a/src/basic/vx_cal/Makefile.in +++ b/src/basic/vx_cal/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -201,8 +201,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -216,8 +214,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -227,13 +226,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -679,7 +677,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/basic/vx_config/Makefile.in b/src/basic/vx_config/Makefile.in index 4781233924..4ff54d234f 100644 --- a/src/basic/vx_config/Makefile.in +++ b/src/basic/vx_config/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -248,8 +248,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ $(top_srcdir)/ylwrap config.tab.cc DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -264,8 +262,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -275,13 +274,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -833,7 +831,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/basic/vx_log/Makefile.in b/src/basic/vx_log/Makefile.in index cd26c0b460..0ac20c1bf6 100644 --- a/src/basic/vx_log/Makefile.in +++ b/src/basic/vx_log/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -180,8 +180,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -195,8 +193,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -206,13 +205,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -477,7 +475,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/basic/vx_math/Makefile.in b/src/basic/vx_math/Makefile.in index dfce6b2c72..93de6cd207 100644 --- a/src/basic/vx_math/Makefile.in +++ b/src/basic/vx_math/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -194,8 +194,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -209,8 +207,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -220,13 +219,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -643,7 +641,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/basic/vx_util/Makefile.in b/src/basic/vx_util/Makefile.in index 4eab9e0dd4..8d17edbdec 100644 --- a/src/basic/vx_util/Makefile.in +++ b/src/basic/vx_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -299,8 +299,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -314,8 +312,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -325,13 +324,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -1331,7 +1329,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/basic/vx_util_math/Makefile.in b/src/basic/vx_util_math/Makefile.in index ad36887abf..e7a6b3ee26 100644 --- a/src/basic/vx_util_math/Makefile.in +++ b/src/basic/vx_util_math/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,8 +179,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -194,8 +192,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -205,13 +204,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -479,7 +477,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/Makefile.in b/src/libcode/Makefile.in index e5ad4aaac4..4afd84dc2a 100644 --- a/src/libcode/Makefile.in +++ b/src/libcode/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -153,8 +153,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = vx_grid vx_data2d vx_nc_util vx_data2d_grib \ vx_data2d_nc_met vx_data2d_nccf vx_data2d_nc_pinterp \ vx_python3_utils vx_data2d_python vx_pointdata_python \ @@ -202,8 +200,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -213,13 +212,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -486,7 +484,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_afm/Makefile.in b/src/libcode/vx_afm/Makefile.in index 7a719a9b05..158c8e5870 100644 --- a/src/libcode/vx_afm/Makefile.in +++ b/src/libcode/vx_afm/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -188,8 +188,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -203,8 +201,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -214,13 +213,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -570,7 +568,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_analysis_util/Makefile.in b/src/libcode/vx_analysis_util/Makefile.in index ae576263c5..1cb02f933d 100644 --- a/src/libcode/vx_analysis_util/Makefile.in +++ b/src/libcode/vx_analysis_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -195,8 +195,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -210,8 +208,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -221,13 +220,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -610,7 +608,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_bool_calc/Makefile.in b/src/libcode/vx_bool_calc/Makefile.in index 794b4332e6..4bea416042 100644 --- a/src/libcode/vx_bool_calc/Makefile.in +++ b/src/libcode/vx_bool_calc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -190,8 +190,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -205,8 +203,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -216,13 +215,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -572,7 +570,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_color/Makefile.in b/src/libcode/vx_color/Makefile.in index 87fab3c9fc..e196db5d71 100644 --- a/src/libcode/vx_color/Makefile.in +++ b/src/libcode/vx_color/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -206,8 +206,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ $(top_srcdir)/ylwrap color_parser_yacc.cc DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -222,8 +220,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -233,13 +232,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -591,7 +589,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d/Makefile.in b/src/libcode/vx_data2d/Makefile.in index 6ba460012e..d6f8e4443b 100644 --- a/src/libcode/vx_data2d/Makefile.in +++ b/src/libcode/vx_data2d/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -190,8 +190,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -205,8 +203,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -216,13 +215,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -573,7 +571,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d_factory/Makefile.in b/src/libcode/vx_data2d_factory/Makefile.in index b7c12004d2..23ec4de70c 100644 --- a/src/libcode/vx_data2d_factory/Makefile.in +++ b/src/libcode/vx_data2d_factory/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -193,8 +193,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -208,8 +206,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -219,13 +218,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -592,7 +590,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d_grib/Makefile.in b/src/libcode/vx_data2d_grib/Makefile.in index b87d2ec376..aede07a3ab 100644 --- a/src/libcode/vx_data2d_grib/Makefile.in +++ b/src/libcode/vx_data2d_grib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -190,8 +190,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -205,8 +203,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -216,13 +215,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -573,7 +571,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d_grib2/Makefile.in b/src/libcode/vx_data2d_grib2/Makefile.in index dfd1d04a0e..3fb8053b10 100644 --- a/src/libcode/vx_data2d_grib2/Makefile.in +++ b/src/libcode/vx_data2d_grib2/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -183,8 +183,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -198,8 +196,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -209,13 +208,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -501,7 +499,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d_nc_met/Makefile.in b/src/libcode/vx_data2d_nc_met/Makefile.in index f531836763..a830b5d0cc 100644 --- a/src/libcode/vx_data2d_nc_met/Makefile.in +++ b/src/libcode/vx_data2d_nc_met/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -187,8 +187,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -202,8 +200,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -213,13 +212,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -538,7 +536,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d_nc_pinterp/Makefile.in b/src/libcode/vx_data2d_nc_pinterp/Makefile.in index 30118a3160..190267e3d6 100644 --- a/src/libcode/vx_data2d_nc_pinterp/Makefile.in +++ b/src/libcode/vx_data2d_nc_pinterp/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -188,8 +188,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -203,8 +201,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -214,13 +213,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -539,7 +537,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d_nccf/Makefile.in b/src/libcode/vx_data2d_nccf/Makefile.in index 04f848882b..d44d8a177c 100644 --- a/src/libcode/vx_data2d_nccf/Makefile.in +++ b/src/libcode/vx_data2d_nccf/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -184,8 +184,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -199,8 +197,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -210,13 +209,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -519,7 +517,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d_python/Makefile.in b/src/libcode/vx_data2d_python/Makefile.in index 531d1bf34c..0740800a11 100644 --- a/src/libcode/vx_data2d_python/Makefile.in +++ b/src/libcode/vx_data2d_python/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -191,8 +191,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -206,8 +204,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -217,13 +216,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -574,7 +572,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d_ugrid/Makefile.in b/src/libcode/vx_data2d_ugrid/Makefile.in index cb9cc10e2a..d21f71256c 100644 --- a/src/libcode/vx_data2d_ugrid/Makefile.in +++ b/src/libcode/vx_data2d_ugrid/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -185,8 +185,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -200,8 +198,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -211,13 +210,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -520,7 +518,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_geodesy/Makefile.in b/src/libcode/vx_geodesy/Makefile.in index b0110db2ed..8d44ccc5ee 100644 --- a/src/libcode/vx_geodesy/Makefile.in +++ b/src/libcode/vx_geodesy/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,8 +179,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -194,8 +192,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -205,13 +204,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -482,7 +480,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_gis/Makefile.in b/src/libcode/vx_gis/Makefile.in index 599ab26ab7..8960a31f2c 100644 --- a/src/libcode/vx_gis/Makefile.in +++ b/src/libcode/vx_gis/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -188,8 +188,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -203,8 +201,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -214,13 +213,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -573,7 +571,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_gnomon/Makefile.in b/src/libcode/vx_gnomon/Makefile.in index fe0a42cc36..6c4fc1cafc 100644 --- a/src/libcode/vx_gnomon/Makefile.in +++ b/src/libcode/vx_gnomon/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,8 +179,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -194,8 +192,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -205,13 +204,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -479,7 +477,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_grid/Makefile.in b/src/libcode/vx_grid/Makefile.in index 1c1240cc64..0bdd8ad913 100644 --- a/src/libcode/vx_grid/Makefile.in +++ b/src/libcode/vx_grid/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -221,8 +221,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -236,8 +234,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -247,13 +246,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -741,7 +739,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_gsl_prob/Makefile.in b/src/libcode/vx_gsl_prob/Makefile.in index f52f8dd65b..1e9771e5f9 100644 --- a/src/libcode/vx_gsl_prob/Makefile.in +++ b/src/libcode/vx_gsl_prob/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -187,8 +187,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -202,8 +200,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -213,13 +212,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -554,7 +552,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_nav/Makefile.in b/src/libcode/vx_nav/Makefile.in index e5596245cd..cac853b6a3 100644 --- a/src/libcode/vx_nav/Makefile.in +++ b/src/libcode/vx_nav/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,8 +179,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -194,8 +192,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -205,13 +204,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -479,7 +477,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_nc_obs/Makefile.in b/src/libcode/vx_nc_obs/Makefile.in index 02bda4d664..49c7bca263 100644 --- a/src/libcode/vx_nc_obs/Makefile.in +++ b/src/libcode/vx_nc_obs/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -189,8 +189,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -204,8 +202,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -215,13 +214,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -571,7 +569,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_nc_util/Makefile.in b/src/libcode/vx_nc_util/Makefile.in index b84607d759..dc24786069 100644 --- a/src/libcode/vx_nc_util/Makefile.in +++ b/src/libcode/vx_nc_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -187,8 +187,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -202,8 +200,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -213,13 +212,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -555,7 +553,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_pb_util/Makefile.in b/src/libcode/vx_pb_util/Makefile.in index c0d3567d07..5ac023f347 100644 --- a/src/libcode/vx_pb_util/Makefile.in +++ b/src/libcode/vx_pb_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -185,8 +185,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -200,8 +198,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -211,13 +210,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -536,7 +534,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_physics/Makefile.in b/src/libcode/vx_physics/Makefile.in index d4bd0e7f9c..9e7a7773fe 100644 --- a/src/libcode/vx_physics/Makefile.in +++ b/src/libcode/vx_physics/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,8 +179,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -194,8 +192,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -205,13 +204,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -481,7 +479,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_plot_util/Makefile.in b/src/libcode/vx_plot_util/Makefile.in index c2b9cf80f2..8aba77a5a0 100644 --- a/src/libcode/vx_plot_util/Makefile.in +++ b/src/libcode/vx_plot_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -184,8 +184,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -199,8 +197,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -210,13 +209,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -518,7 +516,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_pointdata_python/Makefile.in b/src/libcode/vx_pointdata_python/Makefile.in index 75e667811b..4ed8d85e76 100644 --- a/src/libcode/vx_pointdata_python/Makefile.in +++ b/src/libcode/vx_pointdata_python/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -188,8 +188,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -203,8 +201,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -214,13 +213,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -538,7 +536,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_ps/Makefile.in b/src/libcode/vx_ps/Makefile.in index 0644b2b031..87ade543e6 100644 --- a/src/libcode/vx_ps/Makefile.in +++ b/src/libcode/vx_ps/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -189,8 +189,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -204,8 +202,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -215,13 +214,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -571,7 +569,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_pxm/Makefile.in b/src/libcode/vx_pxm/Makefile.in index e6caf38b48..befe52399a 100644 --- a/src/libcode/vx_pxm/Makefile.in +++ b/src/libcode/vx_pxm/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -186,8 +186,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -201,8 +199,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -212,13 +211,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -569,7 +567,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_python3_utils/Makefile.in b/src/libcode/vx_python3_utils/Makefile.in index 4a03cf717b..6743616a88 100644 --- a/src/libcode/vx_python3_utils/Makefile.in +++ b/src/libcode/vx_python3_utils/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -191,8 +191,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -206,9 +204,10 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -I../../../src/basic/vx_math \ -I../../../src/basic/vx_cal +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -218,13 +217,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -576,7 +574,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_regrid/Makefile.in b/src/libcode/vx_regrid/Makefile.in index 37fc8142a2..f91ba4b770 100644 --- a/src/libcode/vx_regrid/Makefile.in +++ b/src/libcode/vx_regrid/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -181,8 +181,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -196,8 +194,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -207,13 +206,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -499,7 +497,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_render/Makefile.in b/src/libcode/vx_render/Makefile.in index dfc992afcb..02894f2e4b 100644 --- a/src/libcode/vx_render/Makefile.in +++ b/src/libcode/vx_render/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -203,8 +203,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -218,8 +216,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -229,13 +228,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -698,7 +696,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_seeps/Makefile.in b/src/libcode/vx_seeps/Makefile.in index 69cd441562..ffea58f62a 100644 --- a/src/libcode/vx_seeps/Makefile.in +++ b/src/libcode/vx_seeps/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,8 +179,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -194,8 +192,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -205,13 +204,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -481,7 +479,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_series_data/Makefile.in b/src/libcode/vx_series_data/Makefile.in index 73cdeedae3..1054d5ab8c 100644 --- a/src/libcode/vx_series_data/Makefile.in +++ b/src/libcode/vx_series_data/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -182,8 +182,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -197,8 +195,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -208,13 +207,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -500,7 +498,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_shapedata/Makefile.in b/src/libcode/vx_shapedata/Makefile.in index 9dce0a920c..593b779872 100644 --- a/src/libcode/vx_shapedata/Makefile.in +++ b/src/libcode/vx_shapedata/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -195,8 +195,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -210,8 +208,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -221,13 +220,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -628,7 +626,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_solar/Makefile.in b/src/libcode/vx_solar/Makefile.in index 0ac8e7f56e..8f783ba458 100644 --- a/src/libcode/vx_solar/Makefile.in +++ b/src/libcode/vx_solar/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -181,8 +181,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -196,8 +194,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -207,13 +206,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -496,7 +494,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_stat_out/Makefile.in b/src/libcode/vx_stat_out/Makefile.in index 6eeafd8560..f701fe7d50 100644 --- a/src/libcode/vx_stat_out/Makefile.in +++ b/src/libcode/vx_stat_out/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -181,8 +181,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -196,8 +194,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -207,13 +206,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -500,7 +498,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_statistics/Makefile.in b/src/libcode/vx_statistics/Makefile.in index c9e2ec474c..f0e0461d01 100644 --- a/src/libcode/vx_statistics/Makefile.in +++ b/src/libcode/vx_statistics/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -206,8 +206,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -221,8 +219,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -232,13 +231,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -717,7 +715,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_summary/Makefile.in b/src/libcode/vx_summary/Makefile.in index afe46fb9b0..d39a9130b4 100644 --- a/src/libcode/vx_summary/Makefile.in +++ b/src/libcode/vx_summary/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -201,8 +201,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -216,8 +214,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -227,13 +226,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -680,7 +678,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_tc_util/Makefile.in b/src/libcode/vx_tc_util/Makefile.in index 3b878bf2de..fe11bd49c1 100644 --- a/src/libcode/vx_tc_util/Makefile.in +++ b/src/libcode/vx_tc_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -215,8 +215,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -230,8 +228,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -241,13 +240,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -806,7 +804,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_time_series/Makefile.in b/src/libcode/vx_time_series/Makefile.in index 3b2569ee9e..11395a5226 100644 --- a/src/libcode/vx_time_series/Makefile.in +++ b/src/libcode/vx_time_series/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -183,8 +183,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -198,8 +196,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -209,13 +208,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -502,7 +500,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in index 569cbcbcb0..3cfab2a262 100644 --- a/src/tools/Makefile.in +++ b/src/tools/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -151,8 +151,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = core other tc_utils dev_utils am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -192,8 +190,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -203,13 +202,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -473,7 +471,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/Makefile.in b/src/tools/core/Makefile.in index f95c75793d..7eca6731e2 100644 --- a/src/tools/core/Makefile.in +++ b/src/tools/core/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -158,8 +158,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = ensemble_stat grid_stat mode mode_analysis pcp_combine \ point_stat stat_analysis wavelet_stat series_analysis am__DIST_COMMON = $(srcdir)/Makefile.in @@ -200,8 +198,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -211,13 +210,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -479,7 +477,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/ensemble_stat/Makefile.in b/src/tools/core/ensemble_stat/Makefile.in index ed7f377cbb..05022c8d16 100644 --- a/src/tools/core/ensemble_stat/Makefile.in +++ b/src/tools/core/ensemble_stat/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -169,8 +169,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -184,8 +182,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -195,13 +194,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -555,7 +553,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/grid_stat/Makefile.in b/src/tools/core/grid_stat/Makefile.in index c5b8b42427..a1d736fb93 100644 --- a/src/tools/core/grid_stat/Makefile.in +++ b/src/tools/core/grid_stat/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -168,8 +168,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,8 +181,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -194,13 +193,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -553,7 +551,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/mode/Makefile.in b/src/tools/core/mode/Makefile.in index 2a9b828999..deec72de8d 100644 --- a/src/tools/core/mode/Makefile.in +++ b/src/tools/core/mode/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -186,8 +186,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -201,8 +199,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -212,13 +211,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -789,7 +787,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/mode_analysis/Makefile.in b/src/tools/core/mode_analysis/Makefile.in index 7ac8f113a0..5ab89d8c41 100644 --- a/src/tools/core/mode_analysis/Makefile.in +++ b/src/tools/core/mode_analysis/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -169,8 +169,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -184,8 +182,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -195,13 +194,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -554,7 +552,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/pcp_combine/Makefile.in b/src/tools/core/pcp_combine/Makefile.in index b6bd2ada9a..ef5e070bdc 100644 --- a/src/tools/core/pcp_combine/Makefile.in +++ b/src/tools/core/pcp_combine/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -166,8 +166,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -181,8 +179,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -192,13 +191,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -525,7 +523,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/point_stat/Makefile.in b/src/tools/core/point_stat/Makefile.in index 9822e7b04c..6f8bfe91b6 100644 --- a/src/tools/core/point_stat/Makefile.in +++ b/src/tools/core/point_stat/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -168,8 +168,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,8 +181,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -194,13 +193,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -554,7 +552,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/series_analysis/Makefile.in b/src/tools/core/series_analysis/Makefile.in index dc41156a30..c45f2828c9 100644 --- a/src/tools/core/series_analysis/Makefile.in +++ b/src/tools/core/series_analysis/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -169,8 +169,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -184,8 +182,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -195,13 +194,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -554,7 +552,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/stat_analysis/Makefile.in b/src/tools/core/stat_analysis/Makefile.in index aede96c476..c7237f62c0 100644 --- a/src/tools/core/stat_analysis/Makefile.in +++ b/src/tools/core/stat_analysis/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -174,8 +174,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -189,8 +187,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -200,13 +199,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -613,7 +611,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/wavelet_stat/Makefile.in b/src/tools/core/wavelet_stat/Makefile.in index 42a70d6820..d90c9b82bd 100644 --- a/src/tools/core/wavelet_stat/Makefile.in +++ b/src/tools/core/wavelet_stat/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -168,8 +168,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,8 +181,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -194,13 +193,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -559,7 +557,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/dev_utils/Makefile.in b/src/tools/dev_utils/Makefile.in index 7fb6c01b19..33338bc331 100644 --- a/src/tools/dev_utils/Makefile.in +++ b/src/tools/dev_utils/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -285,8 +285,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -326,8 +324,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -337,13 +336,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -1017,7 +1015,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/dev_utils/shapefiles/Makefile.in b/src/tools/dev_utils/shapefiles/Makefile.in index 1b46cfee11..505bb7d3cd 100644 --- a/src/tools/dev_utils/shapefiles/Makefile.in +++ b/src/tools/dev_utils/shapefiles/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -164,8 +164,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -179,8 +177,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -190,13 +189,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -509,7 +507,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/Makefile.in b/src/tools/other/Makefile.in index 10c4136178..f7d92c8f1f 100644 --- a/src/tools/other/Makefile.in +++ b/src/tools/other/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -167,8 +167,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = gis_utils gen_ens_prod gen_vx_mask plot_data_plane \ plot_point_obs ascii2nc lidar2nc madis2nc pb2nc wwmca_tool \ modis_regrid mode_graphics mode_time_domain gsi_tools \ @@ -212,8 +210,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -223,13 +222,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -494,7 +492,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/ascii2nc/Makefile.in b/src/tools/other/ascii2nc/Makefile.in index 49b049017b..2a70e7684c 100644 --- a/src/tools/other/ascii2nc/Makefile.in +++ b/src/tools/other/ascii2nc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -213,8 +213,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -228,8 +226,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -239,13 +238,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -772,7 +770,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/gen_ens_prod/Makefile.in b/src/tools/other/gen_ens_prod/Makefile.in index e61445a98d..acbf1aa3d1 100644 --- a/src/tools/other/gen_ens_prod/Makefile.in +++ b/src/tools/other/gen_ens_prod/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -169,8 +169,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -184,8 +182,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -195,13 +194,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -555,7 +553,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/gen_vx_mask/Makefile.in b/src/tools/other/gen_vx_mask/Makefile.in index 4003ad1c17..d6d917b4ce 100644 --- a/src/tools/other/gen_vx_mask/Makefile.in +++ b/src/tools/other/gen_vx_mask/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -166,8 +166,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -181,8 +179,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -192,13 +191,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -541,7 +539,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/gis_utils/Makefile.in b/src/tools/other/gis_utils/Makefile.in index ef269df9c6..fe326f0a56 100644 --- a/src/tools/other/gis_utils/Makefile.in +++ b/src/tools/other/gis_utils/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,8 +179,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -194,8 +192,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -205,13 +204,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -580,7 +578,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/grid_diag/Makefile.in b/src/tools/other/grid_diag/Makefile.in index e350a6a9f9..37b1416506 100644 --- a/src/tools/other/grid_diag/Makefile.in +++ b/src/tools/other/grid_diag/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -168,8 +168,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,8 +181,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -194,13 +193,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -552,7 +550,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/gsi_tools/Makefile.in b/src/tools/other/gsi_tools/Makefile.in index 835ea4146c..cee43762e6 100644 --- a/src/tools/other/gsi_tools/Makefile.in +++ b/src/tools/other/gsi_tools/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -204,8 +204,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -219,8 +217,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -230,13 +229,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -808,7 +806,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/ioda2nc/Makefile.in b/src/tools/other/ioda2nc/Makefile.in index 9572c8b526..707a76cd3e 100644 --- a/src/tools/other/ioda2nc/Makefile.in +++ b/src/tools/other/ioda2nc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -181,8 +181,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -196,8 +194,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -207,13 +206,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -565,7 +563,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/lidar2nc/Makefile.in b/src/tools/other/lidar2nc/Makefile.in index 001f3bb6bd..ac1d193ba3 100644 --- a/src/tools/other/lidar2nc/Makefile.in +++ b/src/tools/other/lidar2nc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -181,8 +181,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -196,8 +194,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -207,13 +206,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -592,7 +590,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/madis2nc/Makefile.in b/src/tools/other/madis2nc/Makefile.in index 26730279bd..8450b07247 100644 --- a/src/tools/other/madis2nc/Makefile.in +++ b/src/tools/other/madis2nc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -168,8 +168,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,8 +181,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -194,13 +193,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -552,7 +550,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/mode_graphics/Makefile.in b/src/tools/other/mode_graphics/Makefile.in index 393377df71..5625b71f0a 100644 --- a/src/tools/other/mode_graphics/Makefile.in +++ b/src/tools/other/mode_graphics/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -189,8 +189,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -204,8 +202,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -215,13 +214,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -631,7 +629,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/mode_time_domain/Makefile.in b/src/tools/other/mode_time_domain/Makefile.in index 0976829a62..7c0796b94c 100644 --- a/src/tools/other/mode_time_domain/Makefile.in +++ b/src/tools/other/mode_time_domain/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -207,8 +207,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -222,8 +220,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -233,13 +232,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -963,7 +961,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/modis_regrid/Makefile.in b/src/tools/other/modis_regrid/Makefile.in index 95adbafe15..c729a8f360 100644 --- a/src/tools/other/modis_regrid/Makefile.in +++ b/src/tools/other/modis_regrid/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -176,8 +176,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -191,8 +189,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -202,13 +201,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -641,7 +639,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/pb2nc/Makefile.in b/src/tools/other/pb2nc/Makefile.in index eeb0f7a65f..74683d687e 100644 --- a/src/tools/other/pb2nc/Makefile.in +++ b/src/tools/other/pb2nc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -196,8 +196,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -211,8 +209,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -222,13 +221,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -601,7 +599,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/plot_data_plane/Makefile.in b/src/tools/other/plot_data_plane/Makefile.in index d0833ea6b8..f017f64b3b 100644 --- a/src/tools/other/plot_data_plane/Makefile.in +++ b/src/tools/other/plot_data_plane/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -167,8 +167,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -182,8 +180,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -193,13 +192,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -533,7 +531,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/plot_point_obs/Makefile.in b/src/tools/other/plot_point_obs/Makefile.in index f3d8b15d5c..af7851e794 100644 --- a/src/tools/other/plot_point_obs/Makefile.in +++ b/src/tools/other/plot_point_obs/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -169,8 +169,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -184,8 +182,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -195,13 +194,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -559,7 +557,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/point2grid/Makefile.in b/src/tools/other/point2grid/Makefile.in index d1cfd2740d..e907adfeed 100644 --- a/src/tools/other/point2grid/Makefile.in +++ b/src/tools/other/point2grid/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -180,8 +180,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -195,8 +193,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -206,13 +205,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -559,7 +557,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/regrid_data_plane/Makefile.in b/src/tools/other/regrid_data_plane/Makefile.in index c34f203b8c..ac75642ec6 100644 --- a/src/tools/other/regrid_data_plane/Makefile.in +++ b/src/tools/other/regrid_data_plane/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -168,8 +168,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,8 +181,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -194,13 +193,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -529,7 +527,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/shift_data_plane/Makefile.in b/src/tools/other/shift_data_plane/Makefile.in index eab017a124..3a441c1557 100644 --- a/src/tools/other/shift_data_plane/Makefile.in +++ b/src/tools/other/shift_data_plane/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -168,8 +168,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,8 +181,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -194,13 +193,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -529,7 +527,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/wwmca_tool/Makefile.in b/src/tools/other/wwmca_tool/Makefile.in index f8aa3f9f44..f557c2a805 100644 --- a/src/tools/other/wwmca_tool/Makefile.in +++ b/src/tools/other/wwmca_tool/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -227,8 +227,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -242,8 +240,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -253,13 +252,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -990,7 +988,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/tc_utils/Makefile.in b/src/tools/tc_utils/Makefile.in index 6ca0db4522..81d0bf3db7 100644 --- a/src/tools/tc_utils/Makefile.in +++ b/src/tools/tc_utils/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -150,8 +150,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags DIST_SUBDIRS = tc_dland tc_pairs tc_stat tc_gen tc_rmw rmw_analysis \ tc_diag am__DIST_COMMON = $(srcdir)/Makefile.in @@ -192,8 +190,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -203,13 +202,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -470,7 +468,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.in b/src/tools/tc_utils/rmw_analysis/Makefile.in index d8d42ef7c0..224d6c8f68 100644 --- a/src/tools/tc_utils/rmw_analysis/Makefile.in +++ b/src/tools/tc_utils/rmw_analysis/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -169,8 +169,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -184,8 +182,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -195,13 +194,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -555,7 +553,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/tc_utils/tc_diag/Makefile.in b/src/tools/tc_utils/tc_diag/Makefile.in index 2b58eb112d..276f8f1fe8 100644 --- a/src/tools/tc_utils/tc_diag/Makefile.in +++ b/src/tools/tc_utils/tc_diag/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -170,8 +170,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -185,8 +183,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -196,13 +195,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -573,7 +571,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/tc_utils/tc_dland/Makefile.in b/src/tools/tc_utils/tc_dland/Makefile.in index 945f5be25f..73a5c3d484 100644 --- a/src/tools/tc_utils/tc_dland/Makefile.in +++ b/src/tools/tc_utils/tc_dland/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,8 +179,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -194,8 +192,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -205,13 +204,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -549,7 +547,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/tc_utils/tc_gen/Makefile.in b/src/tools/tc_utils/tc_gen/Makefile.in index 53bc5e92e9..c959b67d9f 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.in +++ b/src/tools/tc_utils/tc_gen/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -168,8 +168,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,8 +181,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -194,13 +193,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -558,7 +556,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/tc_utils/tc_pairs/Makefile.in b/src/tools/tc_utils/tc_pairs/Makefile.in index 8f11ac0233..d927832f62 100644 --- a/src/tools/tc_utils/tc_pairs/Makefile.in +++ b/src/tools/tc_utils/tc_pairs/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -192,8 +192,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -207,8 +205,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -218,13 +217,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -588,7 +586,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/tc_utils/tc_rmw/Makefile.in b/src/tools/tc_utils/tc_rmw/Makefile.in index 4602c2cde2..a5a09172d2 100644 --- a/src/tools/tc_utils/tc_rmw/Makefile.in +++ b/src/tools/tc_utils/tc_rmw/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -170,8 +170,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -185,8 +183,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -196,13 +195,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -572,7 +570,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/tc_utils/tc_stat/Makefile.in b/src/tools/tc_utils/tc_stat/Makefile.in index e9f4fedbee..73c33fe6b4 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.in +++ b/src/tools/tc_utils/tc_stat/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -171,8 +171,6 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -186,8 +184,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -197,13 +196,12 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ -GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_LIBS = @GRIB2_LIBS@ INSTALL = @INSTALL@ @@ -594,7 +592,6 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/ylwrap b/ylwrap index 5943168da7..e8ec109fa2 100755 --- a/ylwrap +++ b/ylwrap @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # Written by Tom Tromey . # From eefd203c50f16ae9ae4a67536bbcd1ac74d66692 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Wed, 15 Nov 2023 11:07:19 -0700 Subject: [PATCH 094/109] #2231 Added the namespace std to map and vector --- .../core/ensemble_stat/ensemble_stat_conf_info.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/tools/core/ensemble_stat/ensemble_stat_conf_info.h b/src/tools/core/ensemble_stat/ensemble_stat_conf_info.h index a6145a6fa8..67c6978744 100644 --- a/src/tools/core/ensemble_stat/ensemble_stat_conf_info.h +++ b/src/tools/core/ensemble_stat/ensemble_stat_conf_info.h @@ -104,7 +104,7 @@ class EnsembleStatVxOpt { StringArray mask_sid; // Masking station ID's // Vector of MaskLatLon objects defining Lat/Lon Point masks - vector mask_llpnt; + std::vector mask_llpnt; StringArray mask_name; // Masking region names StringArray mask_name_area; // Masking area (grid + poly) region names @@ -219,14 +219,14 @@ class EnsembleStatConfInfo { double vld_data_thresh; // Required ratio of valid data for each point // Message type groups that should be processed together - map msg_typ_group_map; - StringArray msg_typ_sfc; + std::map msg_typ_group_map; + StringArray msg_typ_sfc; // Mapping of mask names to MaskPlanes - map mask_area_map; + std::map mask_area_map; // Mapping of mask names to Station ID lists - map mask_sid_map; + std::map mask_sid_map; gsl_rng *rng_ptr; // GSL random number generator (allocated) @@ -269,9 +269,9 @@ class EnsembleStatConfInfo { //////////////////////////////////////////////////////////////////////// -inline int EnsembleStatConfInfo::get_n_vx() const { return(n_vx); } -inline int EnsembleStatConfInfo::get_max_hira_size() const { return(max_hira_size); } -inline int EnsembleStatConfInfo::get_compression_level() { return(conf.nc_compression()); } +inline int EnsembleStatConfInfo::get_n_vx() const { return n_vx; } +inline int EnsembleStatConfInfo::get_max_hira_size() const { return max_hira_size; } +inline int EnsembleStatConfInfo::get_compression_level() { return conf.nc_compression(); } //////////////////////////////////////////////////////////////////////// From 86dd4c300c37c2e3eda08224ed12a36f0a98b69e Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Wed, 15 Nov 2023 11:07:25 -0700 Subject: [PATCH 095/109] #2231 Added the namespace std to map and vector --- src/tools/core/ensemble_stat/ensemble_stat.cc | 122 +++++++++++------- 1 file changed, 75 insertions(+), 47 deletions(-) diff --git a/src/tools/core/ensemble_stat/ensemble_stat.cc b/src/tools/core/ensemble_stat/ensemble_stat.cc index b778e97f2f..f430b0f722 100644 --- a/src/tools/core/ensemble_stat/ensemble_stat.cc +++ b/src/tools/core/ensemble_stat/ensemble_stat.cc @@ -73,8 +73,6 @@ // //////////////////////////////////////////////////////////////////////// -using namespace std; - #include #include #include @@ -86,7 +84,6 @@ using namespace std; #include #include -using namespace netCDF; #include "main.h" #include "ensemble_stat.h" @@ -104,6 +101,9 @@ using namespace netCDF; #include "pointdata_python.h" #endif +using namespace std; +using namespace netCDF; + //////////////////////////////////////////////////////////////////////// static void process_command_line (int, char **); @@ -203,8 +203,9 @@ void process_command_line(int argc, char **argv) { int i; CommandLine cline; ConcatString default_config_file; - Met2dDataFile *ens_mtddf = (Met2dDataFile *) 0; - Met2dDataFile *obs_mtddf = (Met2dDataFile *) 0; + Met2dDataFile *ens_mtddf = (Met2dDataFile *) nullptr; + Met2dDataFile *obs_mtddf = (Met2dDataFile *) nullptr; + const char *method_name = "process_command_line() -> "; // Set default output directory out_dir = "."; @@ -273,7 +274,7 @@ void process_command_line(int argc, char **argv) { n_ens_files = atoi(cline[0].c_str()); if(n_ens_files <= 0) { - mlog << Error << "\nprocess_command_line() -> " + mlog << Error << "\n" << method_name << "the number of ensemble member files must be >= 1 (" << n_ens_files << ")\n\n"; exit(1); @@ -294,7 +295,7 @@ void process_command_line(int argc, char **argv) { // Check for at least one valid input ensemble file if(n_ens_files == 0) { - mlog << Error << "\nprocess_command_line() -> " + mlog << Error << "\n" << method_name << "no valid input ensemble member files specified!\n\n"; exit(1); } @@ -303,14 +304,14 @@ void process_command_line(int argc, char **argv) { if(ctrl_file.nonempty()) { if(n_ens_files == 1 && !ens_file_list.has(ctrl_file)) { - mlog << Error << "\nprocess_command_line() -> " + mlog << Error << "\n" << method_name << "when reading all ensemble members from the same file, " << "the control member must be in that file as well: " << ctrl_file << "\n\n"; exit(1); } else if(n_ens_files > 1 && ens_file_list.has(ctrl_file)) { - mlog << Error << "\nprocess_command_line() -> " + mlog << Error << "\n" << method_name << "the ensemble control file should not appear in the list " << "of ensemble member files: " << ctrl_file << "\n\n"; exit(1); @@ -332,7 +333,7 @@ void process_command_line(int argc, char **argv) { obs_valid_end_ut != (unixtime) 0 && obs_valid_beg_ut > obs_valid_end_ut) { - mlog << Error << "\nprocess_command_line() -> " + mlog << Error << "\n" << method_name << "the ending time (" << unix_to_yyyymmdd_hhmmss(obs_valid_end_ut) << ") must be greater than the beginning time (" @@ -357,10 +358,16 @@ void process_command_line(int argc, char **argv) { // Get the ensemble file type from config, if present etype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_fcst)); + if(FileType_UGrid == etype) { + mlog << Error << "\n" << program_name << " -> filetype " + << grdfiletype_to_string(etype) << " from the configuration is not supported\n\n"; + + exit(1); + } // Read the first input ensemble file if(!(ens_mtddf = mtddf_factory.new_met_2d_data_file(ens_file_list[0].c_str(), etype))) { - mlog << Error << "\nprocess_command_line() -> " + mlog << Error << "\n" << method_name << "trouble reading ensemble file \"" << ens_file_list[0] << "\"\n\n"; exit(1); @@ -368,10 +375,18 @@ void process_command_line(int argc, char **argv) { // Store the input ensemble file type etype = ens_mtddf->file_type(); + if(FileType_UGrid == etype) { + mlog << Error << "\n" << program_name << " -> The filetype " + << grdfiletype_to_string(etype) << " (" << ens_file_list[0] + << ") is not supported\n\n"; + + exit(1); + } + // Observation files are required if(!grid_obs_flag && !point_obs_flag) { - mlog << Error << "\nprocess_command_line() -> " + mlog << Error << "\n" << method_name << "the \"-grid_obs\" or \"-point_obs\" command line option " << "must be used at least once.\n\n"; exit(1); @@ -388,10 +403,16 @@ void process_command_line(int argc, char **argv) { // Get the observation file type from config, if present otype = parse_conf_file_type(conf_info.conf.lookup_dictionary(conf_key_obs)); + if(FileType_UGrid == otype) { + mlog << Error << "\n" << program_name << " -> filetype " + << grdfiletype_to_string(otype) << " from the configuration is not supported\n\n"; + + exit(1); + } // Read the first gridded observation file if(!(obs_mtddf = mtddf_factory.new_met_2d_data_file(grid_obs_file_list[0].c_str(), otype))) { - mlog << Error << "\nprocess_command_line() -> " + mlog << Error << "\n" << method_name << "trouble reading gridded observation file \"" << grid_obs_file_list[0] << "\"\n\n"; exit(1); @@ -399,6 +420,13 @@ void process_command_line(int argc, char **argv) { // Store the gridded observation file type otype = obs_mtddf->file_type(); + if(FileType_UGrid == otype) { + mlog << Error << "\n" << program_name << " -> The filetype " + << grdfiletype_to_string(etype) << " (" << grid_obs_file_list[0] + << ") is not supported\n\n"; + + exit(1); + } } // Process the configuration @@ -424,7 +452,7 @@ void process_command_line(int argc, char **argv) { // List the input gridded observations files if(grid_obs_file_list.n() > 0) { - mlog << Debug(1) << "Gridded Observation Files[" + mlog << Debug(1) << method_name << "Gridded Observation Files[" << grid_obs_file_list.n() << "]:\n" ; for(i=0; i 0) { - mlog << Debug(1) << "Point Observation Files[" + mlog << Debug(1) << method_name << "Point Observation Files[" << point_obs_file_list.n() << "]:\n" ; for(i=0; i " + mlog << Warning << "\n" << method_name << "can't open input ensemble file: " << ens_file_list[i] << "\n\n"; ens_file_vld.add(0); @@ -458,7 +486,7 @@ void process_command_line(int argc, char **argv) { // User-specified ensemble mean file if(ens_mean_file.nonempty()) { if(!file_exists(ens_mean_file.c_str())) { - mlog << Warning << "\nprocess_command_line() -> " + mlog << Warning << "\n" << method_name << "can't open input ensemble mean file: " << ens_mean_file << "\n\n"; ens_mean_file = ""; @@ -467,14 +495,14 @@ void process_command_line(int argc, char **argv) { // User-specified ensemble control file if(conf_info.control_id.nonempty() && ctrl_file.empty()) { - mlog << Warning << "\nprocess_command_line() -> " + mlog << Warning << "\n" << method_name << "control_id is set in the config file but " << "control file is not provided with -ctrl argument\n\n"; } // Deallocate memory for data files - if(ens_mtddf) { delete ens_mtddf; ens_mtddf = (Met2dDataFile *) 0; } - if(obs_mtddf) { delete obs_mtddf; obs_mtddf = (Met2dDataFile *) 0; } + if(ens_mtddf) { delete ens_mtddf; ens_mtddf = (Met2dDataFile *) nullptr; } + if(obs_mtddf) { delete obs_mtddf; obs_mtddf = (Met2dDataFile *) nullptr; } return; } @@ -499,7 +527,7 @@ void process_grid(const Grid &fcst_grid) { } DataPlane dp; - Met2dDataFile *mtddf = (Met2dDataFile *) 0; + Met2dDataFile *mtddf = (Met2dDataFile *) nullptr; if(!(mtddf = mtddf_factory.new_met_2d_data_file( grid_obs_file_list[0].c_str(), otype))) { mlog << Error << "\nprocess_grid() -> " @@ -520,7 +548,7 @@ void process_grid(const Grid &fcst_grid) { // Store the observation grid obs_grid = mtddf->grid(); - if(mtddf) { delete mtddf; mtddf = (Met2dDataFile *) 0; } + if(mtddf) { delete mtddf; mtddf = (Met2dDataFile *) nullptr; } } else { obs_grid = fcst_grid; @@ -651,7 +679,7 @@ bool get_data_plane(const char *infile, GrdFileType ftype, } // end if found // Deallocate the data file pointer, if necessary - if(mtddf) { delete mtddf; mtddf = (Met2dDataFile *) 0; } + if(mtddf) { delete mtddf; mtddf = (Met2dDataFile *) nullptr; } return(found); } @@ -663,7 +691,7 @@ bool get_data_plane_array(const char *infile, GrdFileType ftype, bool do_regrid) { int n, i; bool found; - Met2dDataFile *mtddf = (Met2dDataFile *) 0; + Met2dDataFile *mtddf = (Met2dDataFile *) nullptr; // Read the current ensemble file if(!(mtddf = mtddf_factory.new_met_2d_data_file(infile, ftype))) { @@ -711,7 +739,7 @@ bool get_data_plane_array(const char *infile, GrdFileType ftype, } // end if found // Deallocate the data file pointer, if necessary - if(mtddf) { delete mtddf; mtddf = (Met2dDataFile *) 0; } + if(mtddf) { delete mtddf; mtddf = (Met2dDataFile *) nullptr; } return(found); } @@ -1208,12 +1236,12 @@ void process_grid_vx() { int i, j, k, n_miss, i_file; bool found; MaskPlane mask_mp; - DataPlane *fcst_dp = (DataPlane *) 0; - DataPlane *fraw_dp = (DataPlane *) 0; + DataPlane *fcst_dp = (DataPlane *) nullptr; + DataPlane *fraw_dp = (DataPlane *) nullptr; DataPlane obs_dp, oraw_dp; DataPlane emn_dp, cmn_dp, csd_dp; PairDataEnsemble pd_all, pd; - ObsErrorEntry *oerr_ptr = (ObsErrorEntry *) 0; + ObsErrorEntry *oerr_ptr = (ObsErrorEntry *) nullptr; VarInfo * var_info; ConcatString fcst_file; @@ -1572,12 +1600,12 @@ void process_grid_vx() { } // end for i // Delete allocated DataPlane objects - if(fcst_dp) { delete [] fcst_dp; fcst_dp = (DataPlane *) 0; } - if(fraw_dp) { delete [] fraw_dp; fraw_dp = (DataPlane *) 0; } + if(fcst_dp) { delete [] fcst_dp; fcst_dp = (DataPlane *) nullptr; } + if(fraw_dp) { delete [] fraw_dp; fraw_dp = (DataPlane *) nullptr; } // Close the output NetCDF file if(nc_out) { - delete nc_out; nc_out = (NcFile *) 0; + delete nc_out; nc_out = (NcFile *) nullptr; } return; @@ -1593,7 +1621,7 @@ void process_grid_scores(int i_vx, ObsErrorEntry *oerr_ptr, PairDataEnsemble &pd) { int i, j, x, y, n_miss; double cmn, csd; - ObsErrorEntry *e = (ObsErrorEntry *) 0; + ObsErrorEntry *e = (ObsErrorEntry *) nullptr; // Allocate memory in one big chunk based on grid size pd.extend(nxy); @@ -1632,7 +1660,7 @@ void process_grid_scores(int i_vx, conf_info.obtype.c_str(), oraw_dp(x,y)); } else { - e = (ObsErrorEntry *) 0; + e = (ObsErrorEntry *) nullptr; } // Store the observation error entry pointer @@ -2178,7 +2206,7 @@ void do_pct_cat_thresh(const EnsembleStatVxOpt &vx_opt, const PairDataEnsemble &pd_ens) { int i, i_thr, i_bin, i_obs, i_ens; int n_vld, n_evt, n_bin; - PCTInfo *pct_info = (PCTInfo *) 0; + PCTInfo *pct_info = (PCTInfo *) nullptr; PairDataPoint pd_pnt, pd; ConcatString fcst_var_cs, cs; @@ -2276,7 +2304,7 @@ void do_pct_cat_thresh(const EnsembleStatVxOpt &vx_opt, shc.set_fcst_var(fcst_var_cs); // Dealloate memory - if(pct_info) { delete [] pct_info; pct_info = (PCTInfo *) 0; } + if(pct_info) { delete [] pct_info; pct_info = (PCTInfo *) nullptr; } return; } @@ -2287,7 +2315,7 @@ void do_pct_cdp_thresh(const EnsembleStatVxOpt &vx_opt, const PairDataEnsemble &pd_ens) { int i, i_thr, i_bin, i_obs, i_ens; int n_vld, n_evt, n_bin; - PCTInfo *pct_info = (PCTInfo *) 0; + PCTInfo *pct_info = (PCTInfo *) nullptr; PairDataPoint pd_pnt, pd; ThreshArray cdp_thresh; @@ -2361,7 +2389,7 @@ void do_pct_cdp_thresh(const EnsembleStatVxOpt &vx_opt, write_pct_info(vx_opt, pct_info, n_bin, true); // Dealloate memory - if(pct_info) { delete [] pct_info; pct_info = (PCTInfo *) 0; } + if(pct_info) { delete [] pct_info; pct_info = (PCTInfo *) nullptr; } return; } @@ -2456,11 +2484,11 @@ void write_orank_nc(PairDataEnsemble &pd, DataPlane &dp, int i, n; // Arrays for storing observation rank data - float *obs_v = (float *) 0; - int *obs_rank = (int *) 0; - float *obs_pit = (float *) 0; - int *ens_vld = (int *) 0; - float *ens_mean = (float *) 0; + float *obs_v = (float *) nullptr; + int *obs_rank = (int *) nullptr; + float *obs_pit = (float *) nullptr; + int *ens_vld = (int *) nullptr; + float *ens_mean = (float *) nullptr; // Allocate memory for storing ensemble data obs_v = new float [nxy]; @@ -2529,11 +2557,11 @@ void write_orank_nc(PairDataEnsemble &pd, DataPlane &dp, } // Deallocate and clean up - if(obs_v) { delete [] obs_v; obs_v = (float *) 0; } - if(obs_rank) { delete [] obs_rank; obs_rank = (int *) 0; } - if(obs_pit) { delete [] obs_pit; obs_pit = (float *) 0; } - if(ens_vld) { delete [] ens_vld; ens_vld = (int *) 0; } - if(ens_mean) { delete [] ens_mean; ens_mean = (float *) 0; } + if(obs_v) { delete [] obs_v; obs_v = (float *) nullptr; } + if(obs_rank) { delete [] obs_rank; obs_rank = (int *) nullptr; } + if(obs_pit) { delete [] obs_pit; obs_pit = (float *) nullptr; } + if(ens_vld) { delete [] ens_vld; ens_vld = (int *) nullptr; } + if(ens_mean) { delete [] ens_mean; ens_mean = (float *) nullptr; } return; } From 444b753b6c083736d258de51a13eb14085e1c2fd Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Wed, 15 Nov 2023 11:11:11 -0700 Subject: [PATCH 096/109] #2231 Added is_in_distance --- src/libcode/vx_grid/unstructured_grid.cc | 19 ++++++++++++++----- src/libcode/vx_grid/unstructured_grid.h | 2 -- src/libcode/vx_grid/unstructured_grid_defs.h | 1 + 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/libcode/vx_grid/unstructured_grid.cc b/src/libcode/vx_grid/unstructured_grid.cc index 7a7f2312c6..652c59b0d1 100644 --- a/src/libcode/vx_grid/unstructured_grid.cc +++ b/src/libcode/vx_grid/unstructured_grid.cc @@ -125,11 +125,9 @@ void UnstructuredGrid::latlon_to_xy(double lat, double lon, double &x, double &y IndexKDTree::ValueList neighbor = Data.kdtree->closestPoints(_pointLonLat, 1); size_t index(neighbor[0].payload()); double distance_km(neighbor[0].distance()/1000.); - bool is_rejected = (!is_eq(Data.max_distance_km, bad_data_double) - && Data.max_distance_km > 0 - && Data.max_distance_km < distance_km); + bool in_distance = Data.is_in_distance(distance_km); - x = is_rejected ? -1.0 : index; + x = in_distance ? index : -1.0; y = 0; //PointLonLat r_lonlat; @@ -142,7 +140,7 @@ void UnstructuredGrid::latlon_to_xy(double lat, double lon, double &x, double &y << Data.pointLonLat[index].x() << ", " << Data.pointLonLat[index].y() << ") distance= " << distance_km << "km, " << _pointLonLat.distance(Data.pointLonLat[index]) - << " degree" << (is_rejected ? ", rejected" : " ") << "\n"; + << " degree" << (in_distance ? " " : ", rejected") << "\n"; } @@ -389,6 +387,17 @@ void UnstructuredData::copy_from(const UnstructuredData *us_data) { //////////////////////////////////////////////////////////////////////// +bool UnstructuredData::is_in_distance(double distance_km) const { + bool in_distance = is_eq(max_distance_km, bad_data_double) + || (max_distance_km <= 0) + || (max_distance_km >= distance_km); + //if (!in_distance) rejectedCount++; + //totalCount++; + return in_distance; +} + +//////////////////////////////////////////////////////////////////////// + void UnstructuredData::set_points(int count, double *_lon, double *_lat) { clear_data(); diff --git a/src/libcode/vx_grid/unstructured_grid.h b/src/libcode/vx_grid/unstructured_grid.h index bdf09a2a77..b8c3b9eefc 100644 --- a/src/libcode/vx_grid/unstructured_grid.h +++ b/src/libcode/vx_grid/unstructured_grid.h @@ -35,8 +35,6 @@ class UnstructuredGrid : public GridRep { int Nx; - //double distance; //in meters. Set the negative distance to disbale disathce capability - bool wrapLon; diff --git a/src/libcode/vx_grid/unstructured_grid_defs.h b/src/libcode/vx_grid/unstructured_grid_defs.h index 29b9ccfe09..a6de45ec05 100644 --- a/src/libcode/vx_grid/unstructured_grid_defs.h +++ b/src/libcode/vx_grid/unstructured_grid_defs.h @@ -50,6 +50,7 @@ struct UnstructuredData { ~UnstructuredData(); void build_tree(); + bool is_in_distance(double distance_km) const; void set_points(int count, double *_lon, double *_lat); void set_points(int count, const std::vector &); void copy_from(const UnstructuredData *); From 15f65b16c6ee1733e6febc453ccda8c795e48219 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 15 Nov 2023 18:47:37 +0000 Subject: [PATCH 097/109] Per #2231, add --enable-ugrid to the build_met_docker.sh script. --- configure | 8 ++++---- internal/scripts/docker/build_met_docker.sh | 13 ++++++++++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 0f28b4abab..1a58303a58 100755 --- a/configure +++ b/configure @@ -7289,11 +7289,11 @@ if test x$ac_prog_cxx_stdcxx = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 printf %s "checking for $CXX option to enable C++11 features... " >&6; } -if test ${ac_cv_prog_cxx_11+y} +if test ${ac_cv_prog_cxx_cxx11+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_11=no + ac_cv_prog_cxx_cxx11=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7335,11 +7335,11 @@ if test x$ac_prog_cxx_stdcxx = xno then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 printf %s "checking for $CXX option to enable C++98 features... " >&6; } -if test ${ac_cv_prog_cxx_98+y} +if test ${ac_cv_prog_cxx_cxx98+y} then : printf %s "(cached) " >&6 else $as_nop - ac_cv_prog_cxx_98=no + ac_cv_prog_cxx_cxx98=no ac_save_CXX=$CXX cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/internal/scripts/docker/build_met_docker.sh b/internal/scripts/docker/build_met_docker.sh index 297e21508c..f8f008f5e1 100755 --- a/internal/scripts/docker/build_met_docker.sh +++ b/internal/scripts/docker/build_met_docker.sh @@ -4,13 +4,24 @@ echo "Running script to build MET in Docker" source internal/scripts/environment/development.docker +# Check whether MET_GIT_NAME is defined +if [ -z ${MET_GIT_NAME+x} ]; then + MET_GIT_NAME=`git name-rev --name-only HEAD` + echo "Setting MET_GIT_NAME=${MET_GIT_NAME} based on the current branch." +fi + +# Create log directory mkdir -p /met/logs LOG_FILE=/met/logs/MET-${MET_GIT_NAME}_configure.log echo "Running bootstrap for MET ${MET_GIT_NAME} and writing log file ${LOG_FILE}" ./bootstrap > ${LOG_FILE} 2>&1 echo "Configuring MET ${MET_GIT_NAME} and appending to log file ${LOG_FILE}" -./configure BUFRLIB_NAME=${BUFRLIB_NAME} GRIB2CLIB_NAME=${GRIB2CLIB_NAME} --enable-grib2 --enable-mode_graphics --enable-modis --enable-lidar2nc --enable-python CPPFLAGS="-I/usr/local/include -I/usr/local/include/freetype2 -I/usr/local/include/cairo" LIBS="-ltirpc" >> ${LOG_FILE} 2>&1 +./configure \ + BUFRLIB_NAME=${BUFRLIB_NAME} GRIB2CLIB_NAME=${GRIB2CLIB_NAME} \ + --enable-grib2 --enable-mode_graphics --enable-modis --enable-lidar2nc --enable-python --enable-ugrid \ + CPPFLAGS="-I/usr/local/include -I/usr/local/include/freetype2 -I/usr/local/include/cairo" \ + LIBS="-ltirpc" >> ${LOG_FILE} 2>&1 if [ $? != 0 ]; then cat ${LOG_FILE} exit 1 From 94a5ae8894ce5523bff384f28a4d3136f3df32fe Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Wed, 15 Nov 2023 12:38:45 -0700 Subject: [PATCH 098/109] #2231 Initialize Nnode and Nedge --- src/libcode/vx_grid/grid_base.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libcode/vx_grid/grid_base.cc b/src/libcode/vx_grid/grid_base.cc index a79f48fab9..9ed499be1e 100644 --- a/src/libcode/vx_grid/grid_base.cc +++ b/src/libcode/vx_grid/grid_base.cc @@ -310,7 +310,6 @@ void UnstructuredData::clear() { name = (const char *) nullptr; - Nface = Nnode = Nedge = 0; max_distance_km = bad_data_double; // disable max_distance clear_data(); @@ -322,7 +321,7 @@ void UnstructuredData::clear() { void UnstructuredData::clear_data() { - Nface = 0; + Nface = Nnode = Nedge = 0; pointLonLat.clear(); lat_checksum = lon_checksum = 0.; From 79658054ace7f00b08ed9349f20a977eb182680d Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Wed, 15 Nov 2023 12:39:43 -0700 Subject: [PATCH 099/109] #2231 Give a warning if multiple levels are selected --- src/libcode/vx_data2d_ugrid/var_info_ugrid.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc b/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc index 1129a9eec5..bce434a950 100644 --- a/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc +++ b/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc @@ -168,7 +168,7 @@ void VarInfoUGrid::set_magic(const ConcatString &nstr, const ConcatString &lstr) set_name(nstr); // If there's no level specification, assume (*, *) - if(strchr(lstr.c_str(), '(') == nullptr) { + if(0 == lstr.length() || strchr(lstr.c_str(), '(') == nullptr) { Level.set_req_name("0,*"); Level.set_name("0,*"); clear_dimension(); @@ -339,6 +339,7 @@ void VarInfoUGrid::set_dict(Dictionary &dict){ char lvl_type = ' '; ConcatString cfg_name = dict.lookup_string("name"); ConcatString cfg_level = dict.lookup_string("level"); + const char * method_name = "VarInfoUGrid::set_dict() -> "; VarInfo::set_dict(dict); @@ -350,6 +351,11 @@ void VarInfoUGrid::set_dict(Dictionary &dict){ } else set_magic(cfg_name, cfg_level); + if (Level.lower() != Level.upper()) { + mlog << Warning << "\n" << method_name + << "Recommend to select the single vertical level for UGrid instead of multiple levels (" + << cfg_level << ")\n\n"; + } set_req_name(cfg_name.c_str()); From 47b351302ad8e9334385197745e2beb15c32e81b Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Wed, 15 Nov 2023 12:41:09 -0700 Subject: [PATCH 100/109] diff --- src/libcode/vx_data2d_ugrid/data2d_ugrid.cc | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc index 05d8ea7a5e..fa96c66941 100644 --- a/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc +++ b/src/libcode/vx_data2d_ugrid/data2d_ugrid.cc @@ -241,7 +241,7 @@ bool MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane, NcVarInfo *d // Adjust dimension and is_offset int dim_size = dimension.n_elements(); - if (0 == dimension.n_elements()) { + if (0 == dim_size) { for (int idx=0; idxNdims; idx++) { long offset = 0; if (zdim_slot == idx &&_cur_vert_index >= 0) offset = _cur_vert_index; @@ -250,6 +250,15 @@ bool MetUGridDataFile::data_plane(VarInfo &vinfo, DataPlane &plane, NcVarInfo *d is_offset.add(true); } } + else if (dim_size < data_var->Ndims) { + for (int idx=dim_size; idxNdims; idx++) { + long offset = 0; + if (zdim_slot == idx &&_cur_vert_index >= 0) offset = _cur_vert_index; + else if (time_dim_slot != idx) offset = vx_data2d_star; + dimension.add(offset); + is_offset.add(true); + } + } for (int idx=0; idx Date: Wed, 15 Nov 2023 12:42:51 -0700 Subject: [PATCH 101/109] #2231 Check the face dimension between data file and metadata file --- src/libcode/vx_data2d_ugrid/ugrid_file.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.cc b/src/libcode/vx_data2d_ugrid/ugrid_file.cc index 04f4788d5a..c643e49c1e 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.cc +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.cc @@ -221,6 +221,14 @@ bool UGridFile::open_metadata(const char * filepath) dim = get_nc_dim(_ncMetaFile, meta_name.c_str()); face_count = get_dim_size(&dim); _faceDim = new NcDim(dim); + NcDim face_dim = get_nc_dim(_ncFile, meta_name.c_str()); + int data_face_count = get_dim_size(&face_dim); + if (face_count != data_face_count) { + mlog << Error << "\n" << method_name + << meta_name << " dimension is different: data file = " + << data_face_count << ", metadata file = " << face_count << "\n\n"; + exit(1); + } } // Node (vertex) dimension @@ -926,13 +934,13 @@ void UGridFile::read_netcdf_grid() if (get_var_units(_latVar, units_value)) { if (units_value == "rad" || units_value == "radian") { - mlog << Debug(6) << method_name << " convert lat (" < Date: Wed, 15 Nov 2023 12:46:52 -0700 Subject: [PATCH 102/109] Per #2231, update configure.ac, configure, and all the Makefile.am and Makefile.in files. These changes break are for GRIB2, Python, and UGRID to differentiate between the internal MET libraries from the associated external dependencies. Replace existing GRIB2_LIBS with GRIB2_MET_LIBS and GRIB2_DEP_LIBS. Do the same for PYTHON_LIBS and UGRID_LIBS. --- Makefile.in | 9 +++-- configure | 33 +++++++++++++------ configure.ac | 30 +++++++++++------ data/Makefile.in | 9 +++-- data/climo/Makefile.in | 9 +++-- data/climo/seeps/Makefile.in | 9 +++-- data/colortables/Makefile.in | 9 +++-- data/colortables/NCL_colortables/Makefile.in | 9 +++-- data/config/Makefile.in | 9 +++-- data/map/Makefile.in | 9 +++-- data/map/admin_by_country/Makefile.in | 9 +++-- data/poly/HMT_masks/Makefile.in | 9 +++-- data/poly/Makefile.in | 9 +++-- data/poly/NCEP_masks/Makefile.in | 9 +++-- data/ps/Makefile.in | 9 +++-- data/table_files/Makefile.in | 9 +++-- data/tc_data/Makefile.in | 9 +++-- internal/test_util/Makefile.in | 9 +++-- internal/test_util/basic/Makefile.in | 9 +++-- .../test_util/basic/vx_config/Makefile.in | 9 +++-- internal/test_util/basic/vx_log/Makefile.in | 9 +++-- internal/test_util/basic/vx_util/Makefile.am | 6 ++-- internal/test_util/basic/vx_util/Makefile.in | 19 +++++++---- internal/test_util/libcode/Makefile.in | 9 +++-- .../test_util/libcode/vx_data2d/Makefile.am | 2 +- .../test_util/libcode/vx_data2d/Makefile.in | 14 +++++--- .../libcode/vx_data2d_factory/Makefile.am | 6 ++-- .../libcode/vx_data2d_factory/Makefile.in | 19 +++++++---- .../libcode/vx_data2d_grib/Makefile.am | 2 +- .../libcode/vx_data2d_grib/Makefile.in | 14 +++++--- .../libcode/vx_data2d_nc_met/Makefile.am | 2 +- .../libcode/vx_data2d_nc_met/Makefile.in | 14 +++++--- .../libcode/vx_data2d_nccf/Makefile.am | 2 +- .../libcode/vx_data2d_nccf/Makefile.in | 14 +++++--- .../test_util/libcode/vx_geodesy/Makefile.in | 9 +++-- .../test_util/libcode/vx_grid/Makefile.am | 2 +- .../test_util/libcode/vx_grid/Makefile.in | 14 +++++--- .../test_util/libcode/vx_nc_util/Makefile.am | 6 ++-- .../test_util/libcode/vx_nc_util/Makefile.in | 19 +++++++---- .../test_util/libcode/vx_physics/Makefile.in | 9 +++-- .../libcode/vx_plot_util/Makefile.in | 9 +++-- internal/test_util/libcode/vx_ps/Makefile.in | 9 +++-- .../libcode/vx_series_data/Makefile.in | 9 +++-- .../test_util/libcode/vx_solar/Makefile.in | 9 +++-- .../test_util/libcode/vx_tc_util/Makefile.am | 12 +++---- .../test_util/libcode/vx_tc_util/Makefile.in | 28 +++++++++------- internal/test_util/tools/Makefile.in | 9 +++-- internal/test_util/tools/other/Makefile.in | 9 +++-- .../tools/other/mode_time_domain/Makefile.am | 6 ++-- .../tools/other/mode_time_domain/Makefile.in | 18 ++++++---- scripts/Rscripts/Makefile.in | 9 +++-- scripts/Rscripts/include/Makefile.in | 9 +++-- scripts/python/Makefile.in | 9 +++-- scripts/python/examples/Makefile.in | 9 +++-- scripts/python/met/Makefile.in | 9 +++-- scripts/python/pyembed/Makefile.in | 9 +++-- scripts/python/tc_diag/Makefile.in | 9 +++-- scripts/python/utility/Makefile.in | 9 +++-- src/Makefile.in | 9 +++-- src/basic/Makefile.in | 9 +++-- src/basic/enum_to_string/Makefile.in | 9 +++-- src/basic/vx_cal/Makefile.in | 9 +++-- src/basic/vx_config/Makefile.in | 9 +++-- src/basic/vx_log/Makefile.in | 9 +++-- src/basic/vx_math/Makefile.in | 9 +++-- src/basic/vx_util/Makefile.in | 9 +++-- src/basic/vx_util_math/Makefile.in | 9 +++-- src/libcode/Makefile.in | 9 +++-- src/libcode/vx_afm/Makefile.in | 9 +++-- src/libcode/vx_analysis_util/Makefile.in | 9 +++-- src/libcode/vx_bool_calc/Makefile.in | 9 +++-- src/libcode/vx_color/Makefile.in | 9 +++-- src/libcode/vx_data2d/Makefile.in | 9 +++-- src/libcode/vx_data2d_factory/Makefile.in | 9 +++-- src/libcode/vx_data2d_grib/Makefile.in | 9 +++-- src/libcode/vx_data2d_grib2/Makefile.in | 9 +++-- src/libcode/vx_data2d_nc_met/Makefile.in | 9 +++-- src/libcode/vx_data2d_nc_pinterp/Makefile.in | 9 +++-- src/libcode/vx_data2d_nccf/Makefile.in | 9 +++-- src/libcode/vx_data2d_python/Makefile.in | 9 +++-- src/libcode/vx_data2d_ugrid/Makefile.in | 9 +++-- src/libcode/vx_geodesy/Makefile.in | 9 +++-- src/libcode/vx_gis/Makefile.in | 9 +++-- src/libcode/vx_gnomon/Makefile.in | 9 +++-- src/libcode/vx_grid/Makefile.in | 9 +++-- src/libcode/vx_gsl_prob/Makefile.in | 9 +++-- src/libcode/vx_nav/Makefile.in | 9 +++-- src/libcode/vx_nc_obs/Makefile.in | 9 +++-- src/libcode/vx_nc_util/Makefile.in | 9 +++-- src/libcode/vx_pb_util/Makefile.in | 9 +++-- src/libcode/vx_physics/Makefile.in | 9 +++-- src/libcode/vx_plot_util/Makefile.in | 9 +++-- src/libcode/vx_pointdata_python/Makefile.in | 9 +++-- src/libcode/vx_ps/Makefile.in | 9 +++-- src/libcode/vx_pxm/Makefile.in | 9 +++-- src/libcode/vx_python3_utils/Makefile.in | 9 +++-- src/libcode/vx_regrid/Makefile.in | 9 +++-- src/libcode/vx_render/Makefile.in | 9 +++-- src/libcode/vx_seeps/Makefile.in | 9 +++-- src/libcode/vx_series_data/Makefile.in | 9 +++-- src/libcode/vx_shapedata/Makefile.in | 9 +++-- src/libcode/vx_solar/Makefile.in | 9 +++-- src/libcode/vx_stat_out/Makefile.in | 9 +++-- src/libcode/vx_statistics/Makefile.in | 9 +++-- src/libcode/vx_summary/Makefile.in | 9 +++-- src/libcode/vx_tc_util/Makefile.in | 9 +++-- src/libcode/vx_time_series/Makefile.in | 9 +++-- src/tools/Makefile.in | 9 +++-- src/tools/core/Makefile.in | 9 +++-- src/tools/core/ensemble_stat/Makefile.am | 8 ++--- src/tools/core/ensemble_stat/Makefile.in | 19 +++++++---- src/tools/core/grid_stat/Makefile.am | 6 ++-- src/tools/core/grid_stat/Makefile.in | 18 ++++++---- src/tools/core/mode/Makefile.am | 6 ++-- src/tools/core/mode/Makefile.in | 18 ++++++---- src/tools/core/mode_analysis/Makefile.am | 8 ++--- src/tools/core/mode_analysis/Makefile.in | 19 +++++++---- src/tools/core/pcp_combine/Makefile.am | 6 ++-- src/tools/core/pcp_combine/Makefile.in | 18 ++++++---- src/tools/core/point_stat/Makefile.am | 8 ++--- src/tools/core/point_stat/Makefile.in | 19 +++++++---- src/tools/core/series_analysis/Makefile.am | 6 ++-- src/tools/core/series_analysis/Makefile.in | 19 +++++++---- src/tools/core/stat_analysis/Makefile.am | 6 ++-- src/tools/core/stat_analysis/Makefile.in | 19 +++++++---- src/tools/core/wavelet_stat/Makefile.am | 6 ++-- src/tools/core/wavelet_stat/Makefile.in | 19 +++++++---- src/tools/dev_utils/Makefile.am | 6 ++-- src/tools/dev_utils/Makefile.in | 19 +++++++---- src/tools/dev_utils/shapefiles/Makefile.in | 9 +++-- src/tools/other/Makefile.in | 9 +++-- src/tools/other/ascii2nc/Makefile.am | 8 ++--- src/tools/other/ascii2nc/Makefile.in | 19 +++++++---- src/tools/other/gen_ens_prod/Makefile.am | 8 ++--- src/tools/other/gen_ens_prod/Makefile.in | 19 +++++++---- src/tools/other/gen_vx_mask/Makefile.am | 6 ++-- src/tools/other/gen_vx_mask/Makefile.in | 18 ++++++---- src/tools/other/gis_utils/Makefile.in | 9 +++-- src/tools/other/grid_diag/Makefile.am | 6 ++-- src/tools/other/grid_diag/Makefile.in | 18 ++++++---- src/tools/other/gsi_tools/Makefile.am | 16 ++++----- src/tools/other/gsi_tools/Makefile.in | 29 +++++++++------- src/tools/other/ioda2nc/Makefile.am | 8 ++--- src/tools/other/ioda2nc/Makefile.in | 19 +++++++---- src/tools/other/lidar2nc/Makefile.am | 6 ++-- src/tools/other/lidar2nc/Makefile.in | 18 ++++++---- src/tools/other/madis2nc/Makefile.am | 8 ++--- src/tools/other/madis2nc/Makefile.in | 19 +++++++---- src/tools/other/mode_graphics/Makefile.am | 4 +-- src/tools/other/mode_graphics/Makefile.in | 14 +++++--- src/tools/other/mode_time_domain/Makefile.am | 6 ++-- src/tools/other/mode_time_domain/Makefile.in | 18 ++++++---- src/tools/other/modis_regrid/Makefile.am | 6 ++-- src/tools/other/modis_regrid/Makefile.in | 19 +++++++---- src/tools/other/pb2nc/Makefile.am | 8 ++--- src/tools/other/pb2nc/Makefile.in | 19 +++++++---- src/tools/other/plot_data_plane/Makefile.am | 6 ++-- src/tools/other/plot_data_plane/Makefile.in | 19 +++++++---- src/tools/other/plot_point_obs/Makefile.am | 8 ++--- src/tools/other/plot_point_obs/Makefile.in | 19 +++++++---- src/tools/other/point2grid/Makefile.am | 8 ++--- src/tools/other/point2grid/Makefile.in | 19 +++++++---- src/tools/other/regrid_data_plane/Makefile.am | 6 ++-- src/tools/other/regrid_data_plane/Makefile.in | 19 +++++++---- src/tools/other/shift_data_plane/Makefile.am | 6 ++-- src/tools/other/shift_data_plane/Makefile.in | 19 +++++++---- src/tools/other/wwmca_tool/Makefile.am | 12 +++---- src/tools/other/wwmca_tool/Makefile.in | 28 +++++++++------- src/tools/tc_utils/Makefile.in | 9 +++-- src/tools/tc_utils/rmw_analysis/Makefile.am | 6 ++-- src/tools/tc_utils/rmw_analysis/Makefile.in | 18 ++++++---- src/tools/tc_utils/tc_diag/Makefile.am | 6 ++-- src/tools/tc_utils/tc_diag/Makefile.in | 19 +++++++---- src/tools/tc_utils/tc_dland/Makefile.am | 2 +- src/tools/tc_utils/tc_dland/Makefile.in | 14 +++++--- src/tools/tc_utils/tc_gen/Makefile.am | 6 ++-- src/tools/tc_utils/tc_gen/Makefile.in | 19 +++++++---- src/tools/tc_utils/tc_pairs/Makefile.am | 6 ++-- src/tools/tc_utils/tc_pairs/Makefile.in | 19 +++++++---- src/tools/tc_utils/tc_rmw/Makefile.am | 6 ++-- src/tools/tc_utils/tc_rmw/Makefile.in | 19 +++++++---- src/tools/tc_utils/tc_stat/Makefile.am | 6 ++-- src/tools/tc_utils/tc_stat/Makefile.in | 18 ++++++---- 183 files changed, 1257 insertions(+), 749 deletions(-) diff --git a/Makefile.in b/Makefile.in index c8afa46537..582d2a65c8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -233,7 +233,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -296,12 +297,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/configure b/configure index 1a58303a58..483ddd8b88 100755 --- a/configure +++ b/configure @@ -679,13 +679,16 @@ YACC FC_LIBS ENABLE_DEVELOPMENT_FALSE ENABLE_DEVELOPMENT_TRUE -UGRID_LIBS +UGRID_DEP_LIBS +UGRID_MET_LIBS ENABLE_UGRID_FALSE ENABLE_UGRID_TRUE -PYTHON_LIBS +PYTHON_DEP_LIBS +PYTHON_MET_LIBS ENABLE_PYTHON_FALSE ENABLE_PYTHON_TRUE -GRIB2_LIBS +GRIB2_DEP_LIBS +GRIB2_MET_LIBS GRIB2CLIB_NAME_SET_FALSE GRIB2CLIB_NAME_SET_TRUE ENABLE_GRIB2_FALSE @@ -6823,17 +6826,21 @@ printf "%s\n" "$as_me: GRIB2 utilites will be compiled" >&6;} { printf "%s\n" "$as_me:${as_lineno-$LINENO}: GRIB2CLIB_NAME will be set" >&5 printf "%s\n" "$as_me: GRIB2CLIB_NAME will be set" >&6;} if test -z "$GRIB2CLIB_NAME"; then - GRIB2_LIBS="-lvx_data2d_grib2 -lgrib2c -ljasper -lpng -lz" + GRIB2_MET_LIBS="-lvx_data2d_grib2" + GRIB2_DEP_LIBS="-lgrib2c -ljasper -lpng -lz" else - GRIB2_LIBS="-lvx_data2d_grib2 ${GRIB2CLIB_NAME} -ljasper -lpng -lz" + GRIB2_MET_LIBS="-lvx_data2d_grib2" + GRIB2_DEP_LIBS="${GRIB2CLIB_NAME} -ljasper -lpng -lz" fi else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: GRIB2 utilities will not be compiled" >&5 printf "%s\n" "$as_me: GRIB2 utilities will not be compiled" >&6;} - GRIB2_LIBS= + GRIB2_MET_LIBS= + GRIB2_DEP_LIBS= fi + # Python # Check whether --enable-python was given. @@ -6865,14 +6872,17 @@ printf "%s\n" "#define ENABLE_PYTHON /**/" >>confdefs.h { printf "%s\n" "$as_me:${as_lineno-$LINENO}: python embedding will be compiled" >&5 printf "%s\n" "$as_me: python embedding will be compiled" >&6;} CPPFLAGS="${CPPFLAGS} -DWITH_PYTHON" - PYTHON_LIBS="-lvx_data2d_python -lvx_pointdata_python -lvx_python3_utils ${MET_PYTHON_LD}" + PYTHON_MET_LIBS="-lvx_data2d_python -lvx_pointdata_python -lvx_python3_utils" + PYTHON_DEP_LIBS="${MET_PYTHON_LD}" else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: python embedding will not be compiled" >&5 printf "%s\n" "$as_me: python embedding will not be compiled" >&6;} - PYTHON_LIBS= + PYTHON_MET_LIBS= + PYTHON_DEP_LIBS= fi + # Unstructure grid with ECMF libraries (Atlas/ecKit) # Check whether --enable-ugrid was given. @@ -6905,14 +6915,17 @@ printf "%s\n" "#define ENABLE_UGRID /**/" >>confdefs.h printf "%s\n" "$as_me: unstructured grid will be compiled" >&6;} CPPFLAGS="${CPPFLAGS} -I${MET_ATLASINC} -I${MET_ECKITINC} -DWITH_UGRID" LDFLAGS="${LDFLAGS} -L${MET_ATLASLIB} -L${MET_ECKITLIB} -Wl,-rpath,${MET_ATLASLIB}:${MET_ECKITLIB}" - UGRID_LIBS="-lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry" + UGRID_MET_LIBS="-lvx_data2d_ugrid" + UGRID_DEP_LIBS="-latlas -leckit -leckit_mpi -leckit_geometry" else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: unstructured grid will not be compiled" >&5 printf "%s\n" "$as_me: unstructured grid will not be compiled" >&6;} - UGRID_LIBS= + UGRID_MET_LIBS= + UGRID_DEP_LIBS= fi + ######################################################################## # Check for the MET_DEVELOPMENT environment variable diff --git a/configure.ac b/configure.ac index 197de3c971..cb4f7c0c63 100644 --- a/configure.ac +++ b/configure.ac @@ -1054,15 +1054,19 @@ if test "x$ENABLE_GRIB2" = "xyes"; then AC_SUBST([GRIB2CLIB_NAME]) AC_MSG_NOTICE([GRIB2CLIB_NAME will be set]) if test -z "$GRIB2CLIB_NAME"; then - GRIB2_LIBS="-lvx_data2d_grib2 -lgrib2c -ljasper -lpng -lz" + GRIB2_MET_LIBS="-lvx_data2d_grib2" + GRIB2_DEP_LIBS="-lgrib2c -ljasper -lpng -lz" else - GRIB2_LIBS="-lvx_data2d_grib2 ${GRIB2CLIB_NAME} -ljasper -lpng -lz" + GRIB2_MET_LIBS="-lvx_data2d_grib2" + GRIB2_DEP_LIBS="${GRIB2CLIB_NAME} -ljasper -lpng -lz" fi else AC_MSG_NOTICE([GRIB2 utilities will not be compiled]) - GRIB2_LIBS= + GRIB2_MET_LIBS= + GRIB2_DEP_LIBS= fi -AC_SUBST([GRIB2_LIBS]) +AC_SUBST([GRIB2_MET_LIBS]) +AC_SUBST([GRIB2_DEP_LIBS]) # Python @@ -1081,12 +1085,15 @@ if test "x$ENABLE_PYTHON" = "xyes"; then AC_DEFINE([ENABLE_PYTHON], [], ["build python embedding"]) AC_MSG_NOTICE([python embedding will be compiled]) CPPFLAGS="${CPPFLAGS} -DWITH_PYTHON" - PYTHON_LIBS="-lvx_data2d_python -lvx_pointdata_python -lvx_python3_utils ${MET_PYTHON_LD}" + PYTHON_MET_LIBS="-lvx_data2d_python -lvx_pointdata_python -lvx_python3_utils" + PYTHON_DEP_LIBS="${MET_PYTHON_LD}" else AC_MSG_NOTICE([python embedding will not be compiled]) - PYTHON_LIBS= + PYTHON_MET_LIBS= + PYTHON_DEP_LIBS= fi -AC_SUBST([PYTHON_LIBS]) +AC_SUBST([PYTHON_MET_LIBS]) +AC_SUBST([PYTHON_DEP_LIBS]) # Unstructure grid with ECMF libraries (Atlas/ecKit) @@ -1106,12 +1113,15 @@ if test "x$ENABLE_UGRID" = "xyes"; then AC_MSG_NOTICE([unstructured grid will be compiled]) CPPFLAGS="${CPPFLAGS} -I${MET_ATLASINC} -I${MET_ECKITINC} -DWITH_UGRID" LDFLAGS="${LDFLAGS} -L${MET_ATLASLIB} -L${MET_ECKITLIB} -Wl,-rpath,${MET_ATLASLIB}:${MET_ECKITLIB}" - UGRID_LIBS="-lvx_data2d_ugrid -latlas -leckit -leckit_mpi -leckit_geometry" + UGRID_MET_LIBS="-lvx_data2d_ugrid" + UGRID_DEP_LIBS="-latlas -leckit -leckit_mpi -leckit_geometry" else AC_MSG_NOTICE([unstructured grid will not be compiled]) - UGRID_LIBS= + UGRID_MET_LIBS= + UGRID_DEP_LIBS= fi -AC_SUBST([UGRID_LIBS]) +AC_SUBST([UGRID_MET_LIBS]) +AC_SUBST([UGRID_DEP_LIBS]) ######################################################################## diff --git a/data/Makefile.in b/data/Makefile.in index 01dd007877..262e9e43cc 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -237,7 +237,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -300,12 +301,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/climo/Makefile.in b/data/climo/Makefile.in index 0897440d66..c6415ac06c 100644 --- a/data/climo/Makefile.in +++ b/data/climo/Makefile.in @@ -207,7 +207,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -270,12 +271,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/climo/seeps/Makefile.in b/data/climo/seeps/Makefile.in index 85c01467c7..761a867e6b 100644 --- a/data/climo/seeps/Makefile.in +++ b/data/climo/seeps/Makefile.in @@ -179,7 +179,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -242,12 +243,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/colortables/Makefile.in b/data/colortables/Makefile.in index 8bcd9da5b7..82b6b46710 100644 --- a/data/colortables/Makefile.in +++ b/data/colortables/Makefile.in @@ -237,7 +237,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -300,12 +301,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/colortables/NCL_colortables/Makefile.in b/data/colortables/NCL_colortables/Makefile.in index f17a76394c..df79826d8d 100644 --- a/data/colortables/NCL_colortables/Makefile.in +++ b/data/colortables/NCL_colortables/Makefile.in @@ -179,7 +179,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -242,12 +243,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/config/Makefile.in b/data/config/Makefile.in index 38bb655e12..e88150a766 100644 --- a/data/config/Makefile.in +++ b/data/config/Makefile.in @@ -179,7 +179,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -242,12 +243,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/map/Makefile.in b/data/map/Makefile.in index 17604ea58f..a34c9c189f 100644 --- a/data/map/Makefile.in +++ b/data/map/Makefile.in @@ -237,7 +237,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -300,12 +301,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/map/admin_by_country/Makefile.in b/data/map/admin_by_country/Makefile.in index e74eb8080a..3f36ae61fb 100644 --- a/data/map/admin_by_country/Makefile.in +++ b/data/map/admin_by_country/Makefile.in @@ -179,7 +179,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -242,12 +243,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/poly/HMT_masks/Makefile.in b/data/poly/HMT_masks/Makefile.in index 2652e1ca80..7284d8de7d 100644 --- a/data/poly/HMT_masks/Makefile.in +++ b/data/poly/HMT_masks/Makefile.in @@ -179,7 +179,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -242,12 +243,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/poly/Makefile.in b/data/poly/Makefile.in index 19f71f1aaf..36890cca0a 100644 --- a/data/poly/Makefile.in +++ b/data/poly/Makefile.in @@ -237,7 +237,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -300,12 +301,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/poly/NCEP_masks/Makefile.in b/data/poly/NCEP_masks/Makefile.in index 621d989052..acda936d43 100644 --- a/data/poly/NCEP_masks/Makefile.in +++ b/data/poly/NCEP_masks/Makefile.in @@ -179,7 +179,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -242,12 +243,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/ps/Makefile.in b/data/ps/Makefile.in index 880648b28f..c017420485 100644 --- a/data/ps/Makefile.in +++ b/data/ps/Makefile.in @@ -179,7 +179,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -242,12 +243,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/table_files/Makefile.in b/data/table_files/Makefile.in index 5f9672622d..08d91b866e 100644 --- a/data/table_files/Makefile.in +++ b/data/table_files/Makefile.in @@ -179,7 +179,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -242,12 +243,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/data/tc_data/Makefile.in b/data/tc_data/Makefile.in index 7d9f8a5d3b..1057808c31 100644 --- a/data/tc_data/Makefile.in +++ b/data/tc_data/Makefile.in @@ -179,7 +179,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -242,12 +243,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/Makefile.in b/internal/test_util/Makefile.in index 9acbcf6787..91fbb38a04 100644 --- a/internal/test_util/Makefile.in +++ b/internal/test_util/Makefile.in @@ -207,7 +207,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -270,12 +271,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/basic/Makefile.in b/internal/test_util/basic/Makefile.in index 2137a410fe..8f7a6ae5f5 100644 --- a/internal/test_util/basic/Makefile.in +++ b/internal/test_util/basic/Makefile.in @@ -207,7 +207,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -270,12 +271,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/basic/vx_config/Makefile.in b/internal/test_util/basic/vx_config/Makefile.in index 912b046ff4..259d6dae5e 100644 --- a/internal/test_util/basic/vx_config/Makefile.in +++ b/internal/test_util/basic/vx_config/Makefile.in @@ -232,7 +232,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -295,12 +296,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/basic/vx_log/Makefile.in b/internal/test_util/basic/vx_log/Makefile.in index b5f512de08..0913f22a00 100644 --- a/internal/test_util/basic/vx_log/Makefile.in +++ b/internal/test_util/basic/vx_log/Makefile.in @@ -201,7 +201,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -264,12 +265,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/basic/vx_util/Makefile.am b/internal/test_util/basic/vx_util/Makefile.am index 7fcf6cf3d4..8717867cda 100644 --- a/internal/test_util/basic/vx_util/Makefile.am +++ b/internal/test_util/basic/vx_util/Makefile.am @@ -89,14 +89,14 @@ test_ascii_header_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/internal/test_util/basic/vx_util/Makefile.in b/internal/test_util/basic/vx_util/Makefile.in index 6c6d4382ac..d904c45e7a 100644 --- a/internal/test_util/basic/vx_util/Makefile.in +++ b/internal/test_util/basic/vx_util/Makefile.in @@ -118,7 +118,9 @@ am_test_ascii_header_OBJECTS = \ test_ascii_header-test_ascii_header.$(OBJEXT) test_ascii_header_OBJECTS = $(am_test_ascii_header_OBJECTS) test_ascii_header_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) test_ascii_header_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(test_ascii_header_LDFLAGS) $(LDFLAGS) -o $@ am_test_command_line_OBJECTS = \ @@ -237,7 +239,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -300,12 +303,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -392,14 +397,14 @@ test_ascii_header_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/internal/test_util/libcode/Makefile.in b/internal/test_util/libcode/Makefile.in index c2211404bb..d83ed27ca1 100644 --- a/internal/test_util/libcode/Makefile.in +++ b/internal/test_util/libcode/Makefile.in @@ -207,7 +207,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -270,12 +271,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/libcode/vx_data2d/Makefile.am b/internal/test_util/libcode/vx_data2d/Makefile.am index 453764611d..747a22c3f1 100644 --- a/internal/test_util/libcode/vx_data2d/Makefile.am +++ b/internal/test_util/libcode/vx_data2d/Makefile.am @@ -34,7 +34,7 @@ dump_default_table_LDFLAGS = -L. ${MET_LDFLAGS} dump_default_table_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_log \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_data2d \ -lvx_grid \ -lvx_geodesy \ diff --git a/internal/test_util/libcode/vx_data2d/Makefile.in b/internal/test_util/libcode/vx_data2d/Makefile.in index 34f3c48e7f..5117e13a0a 100644 --- a/internal/test_util/libcode/vx_data2d/Makefile.in +++ b/internal/test_util/libcode/vx_data2d/Makefile.in @@ -104,7 +104,8 @@ am_dump_default_table_OBJECTS = \ dump_default_table-dump_default_table.$(OBJEXT) dump_default_table_OBJECTS = $(am_dump_default_table_OBJECTS) am__DEPENDENCIES_1 = -dump_default_table_DEPENDENCIES = $(am__DEPENDENCIES_1) +dump_default_table_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) dump_default_table_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(dump_default_table_LDFLAGS) $(LDFLAGS) -o $@ am_test_table_read_OBJECTS = \ @@ -206,7 +207,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -269,12 +271,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -353,7 +357,7 @@ dump_default_table_LDFLAGS = -L. ${MET_LDFLAGS} dump_default_table_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_log \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_data2d \ -lvx_grid \ -lvx_geodesy \ diff --git a/internal/test_util/libcode/vx_data2d_factory/Makefile.am b/internal/test_util/libcode/vx_data2d_factory/Makefile.am index 4f316f1fb1..fe38d4d23f 100644 --- a/internal/test_util/libcode/vx_data2d_factory/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_factory/Makefile.am @@ -32,11 +32,11 @@ test_factory_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/internal/test_util/libcode/vx_data2d_factory/Makefile.in b/internal/test_util/libcode/vx_data2d_factory/Makefile.in index bda681b2a7..331d687f93 100644 --- a/internal/test_util/libcode/vx_data2d_factory/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_factory/Makefile.in @@ -104,7 +104,9 @@ am_test_factory_OBJECTS = test_factory-test_factory.$(OBJEXT) test_factory_OBJECTS = $(am_test_factory_OBJECTS) am__DEPENDENCIES_1 = test_factory_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) test_factory_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(test_factory_LDFLAGS) $(LDFLAGS) -o $@ am_test_is_grib_OBJECTS = test_is_grib-test_is_grib.$(OBJEXT) @@ -203,7 +205,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -266,12 +269,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -348,11 +353,11 @@ test_factory_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/internal/test_util/libcode/vx_data2d_grib/Makefile.am b/internal/test_util/libcode/vx_data2d_grib/Makefile.am index 09f082b3a0..9244018e37 100644 --- a/internal/test_util/libcode/vx_data2d_grib/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_grib/Makefile.am @@ -16,7 +16,7 @@ test_read_grib1_SOURCES = test_read_grib1.cc test_read_grib1_CPPFLAGS = ${MET_CPPFLAGS} test_read_grib1_LDFLAGS = -L. ${MET_LDFLAGS} test_read_grib1_LDADD = -lvx_data2d_grib \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_data2d \ -lvx_grid \ -lvx_geodesy \ diff --git a/internal/test_util/libcode/vx_data2d_grib/Makefile.in b/internal/test_util/libcode/vx_data2d_grib/Makefile.in index 69bffaab0b..3f87570294 100644 --- a/internal/test_util/libcode/vx_data2d_grib/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_grib/Makefile.in @@ -104,7 +104,8 @@ am_test_read_grib1_OBJECTS = \ test_read_grib1-test_read_grib1.$(OBJEXT) test_read_grib1_OBJECTS = $(am_test_read_grib1_OBJECTS) am__DEPENDENCIES_1 = -test_read_grib1_DEPENDENCIES = $(am__DEPENDENCIES_1) +test_read_grib1_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) test_read_grib1_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(test_read_grib1_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -197,7 +198,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -260,12 +262,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -327,7 +331,7 @@ test_read_grib1_SOURCES = test_read_grib1.cc test_read_grib1_CPPFLAGS = ${MET_CPPFLAGS} test_read_grib1_LDFLAGS = -L. ${MET_LDFLAGS} test_read_grib1_LDADD = -lvx_data2d_grib \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_data2d \ -lvx_grid \ -lvx_geodesy \ diff --git a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am index e9094e8dbe..0edfede083 100644 --- a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am @@ -16,7 +16,7 @@ test_read_nc_met_SOURCES = test_read_nc_met.cc test_read_nc_met_CPPFLAGS = ${MET_CPPFLAGS} test_read_nc_met_LDFLAGS = -L. ${MET_LDFLAGS} test_read_nc_met_LDADD = -lvx_data2d_nc_met \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_nc_util \ -lvx_data2d \ -lvx_grid \ diff --git a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in index 1a9ea367fb..501c9356bc 100644 --- a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in @@ -104,7 +104,8 @@ am_test_read_nc_met_OBJECTS = \ test_read_nc_met-test_read_nc_met.$(OBJEXT) test_read_nc_met_OBJECTS = $(am_test_read_nc_met_OBJECTS) am__DEPENDENCIES_1 = -test_read_nc_met_DEPENDENCIES = $(am__DEPENDENCIES_1) +test_read_nc_met_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) test_read_nc_met_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(test_read_nc_met_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -198,7 +199,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -261,12 +263,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -328,7 +332,7 @@ test_read_nc_met_SOURCES = test_read_nc_met.cc test_read_nc_met_CPPFLAGS = ${MET_CPPFLAGS} test_read_nc_met_LDFLAGS = -L. ${MET_LDFLAGS} test_read_nc_met_LDADD = -lvx_data2d_nc_met \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_nc_util \ -lvx_data2d \ -lvx_grid \ diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.am b/internal/test_util/libcode/vx_data2d_nccf/Makefile.am index 84261adf7e..59146cd257 100644 --- a/internal/test_util/libcode/vx_data2d_nccf/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_nccf/Makefile.am @@ -16,7 +16,7 @@ test_read_nccf_SOURCES = test_read_nccf.cc test_read_nccf_CPPFLAGS = ${MET_CPPFLAGS} test_read_nccf_LDFLAGS = -L. ${MET_LDFLAGS} test_read_nccf_LDADD = -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_nc_util \ -lvx_data2d \ -lvx_grid \ diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in index cfe73a3afd..2e52c4b773 100644 --- a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in @@ -103,7 +103,8 @@ PROGRAMS = $(noinst_PROGRAMS) am_test_read_nccf_OBJECTS = test_read_nccf-test_read_nccf.$(OBJEXT) test_read_nccf_OBJECTS = $(am_test_read_nccf_OBJECTS) am__DEPENDENCIES_1 = -test_read_nccf_DEPENDENCIES = $(am__DEPENDENCIES_1) +test_read_nccf_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) test_read_nccf_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(test_read_nccf_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -196,7 +197,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -259,12 +261,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -326,7 +330,7 @@ test_read_nccf_SOURCES = test_read_nccf.cc test_read_nccf_CPPFLAGS = ${MET_CPPFLAGS} test_read_nccf_LDFLAGS = -L. ${MET_LDFLAGS} test_read_nccf_LDADD = -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_nc_util \ -lvx_data2d \ -lvx_grid \ diff --git a/internal/test_util/libcode/vx_geodesy/Makefile.in b/internal/test_util/libcode/vx_geodesy/Makefile.in index c1c9f77834..63e759c489 100644 --- a/internal/test_util/libcode/vx_geodesy/Makefile.in +++ b/internal/test_util/libcode/vx_geodesy/Makefile.in @@ -195,7 +195,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -258,12 +259,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/libcode/vx_grid/Makefile.am b/internal/test_util/libcode/vx_grid/Makefile.am index c783c32b22..e310be9187 100644 --- a/internal/test_util/libcode/vx_grid/Makefile.am +++ b/internal/test_util/libcode/vx_grid/Makefile.am @@ -16,7 +16,7 @@ test_grid_area_SOURCES = test_grid_area.cc test_grid_area_CPPFLAGS = ${MET_CPPFLAGS} test_grid_area_LDFLAGS = -L. ${MET_LDFLAGS} test_grid_area_LDADD = \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_grid \ -lvx_geodesy \ -lvx_nav \ diff --git a/internal/test_util/libcode/vx_grid/Makefile.in b/internal/test_util/libcode/vx_grid/Makefile.in index 8605277488..0719b2fe92 100644 --- a/internal/test_util/libcode/vx_grid/Makefile.in +++ b/internal/test_util/libcode/vx_grid/Makefile.in @@ -103,7 +103,8 @@ PROGRAMS = $(noinst_PROGRAMS) am_test_grid_area_OBJECTS = test_grid_area-test_grid_area.$(OBJEXT) test_grid_area_OBJECTS = $(am_test_grid_area_OBJECTS) am__DEPENDENCIES_1 = -test_grid_area_DEPENDENCIES = $(am__DEPENDENCIES_1) +test_grid_area_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) test_grid_area_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(test_grid_area_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -196,7 +197,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -259,12 +261,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -326,7 +330,7 @@ test_grid_area_SOURCES = test_grid_area.cc test_grid_area_CPPFLAGS = ${MET_CPPFLAGS} test_grid_area_LDFLAGS = -L. ${MET_LDFLAGS} test_grid_area_LDADD = \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_grid \ -lvx_geodesy \ -lvx_nav \ diff --git a/internal/test_util/libcode/vx_nc_util/Makefile.am b/internal/test_util/libcode/vx_nc_util/Makefile.am index 6fef8cf74c..b691fbf392 100644 --- a/internal/test_util/libcode/vx_nc_util/Makefile.am +++ b/internal/test_util/libcode/vx_nc_util/Makefile.am @@ -27,14 +27,14 @@ test_pressure_levels_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/internal/test_util/libcode/vx_nc_util/Makefile.in b/internal/test_util/libcode/vx_nc_util/Makefile.in index af0455eab3..826e385c3e 100644 --- a/internal/test_util/libcode/vx_nc_util/Makefile.in +++ b/internal/test_util/libcode/vx_nc_util/Makefile.in @@ -106,7 +106,9 @@ am_test_pressure_levels_OBJECTS = \ test_pressure_levels_OBJECTS = $(am_test_pressure_levels_OBJECTS) am__DEPENDENCIES_1 = test_pressure_levels_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) test_pressure_levels_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(test_pressure_levels_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -200,7 +202,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -263,12 +266,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -337,14 +342,14 @@ test_pressure_levels_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/internal/test_util/libcode/vx_physics/Makefile.in b/internal/test_util/libcode/vx_physics/Makefile.in index 79622fa275..02f6ef57ae 100644 --- a/internal/test_util/libcode/vx_physics/Makefile.in +++ b/internal/test_util/libcode/vx_physics/Makefile.in @@ -195,7 +195,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -258,12 +259,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/libcode/vx_plot_util/Makefile.in b/internal/test_util/libcode/vx_plot_util/Makefile.in index 986edea8a1..6a950df3aa 100644 --- a/internal/test_util/libcode/vx_plot_util/Makefile.in +++ b/internal/test_util/libcode/vx_plot_util/Makefile.in @@ -196,7 +196,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -259,12 +260,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/libcode/vx_ps/Makefile.in b/internal/test_util/libcode/vx_ps/Makefile.in index 1e2a1c7456..d288997194 100644 --- a/internal/test_util/libcode/vx_ps/Makefile.in +++ b/internal/test_util/libcode/vx_ps/Makefile.in @@ -195,7 +195,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -258,12 +259,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/libcode/vx_series_data/Makefile.in b/internal/test_util/libcode/vx_series_data/Makefile.in index 3c58108554..94871489e0 100644 --- a/internal/test_util/libcode/vx_series_data/Makefile.in +++ b/internal/test_util/libcode/vx_series_data/Makefile.in @@ -197,7 +197,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -260,12 +261,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/libcode/vx_solar/Makefile.in b/internal/test_util/libcode/vx_solar/Makefile.in index 5e00e714be..a7026539c3 100644 --- a/internal/test_util/libcode/vx_solar/Makefile.in +++ b/internal/test_util/libcode/vx_solar/Makefile.in @@ -195,7 +195,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -258,12 +259,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/libcode/vx_tc_util/Makefile.am b/internal/test_util/libcode/vx_tc_util/Makefile.am index f9f85a3050..1aca803372 100644 --- a/internal/test_util/libcode/vx_tc_util/Makefile.am +++ b/internal/test_util/libcode/vx_tc_util/Makefile.am @@ -28,14 +28,14 @@ test_read_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ @@ -64,14 +64,14 @@ test_read_prob_LDADD = -lvx_stat_out \ -lvx_shapedata \ -lvx_util_math \ -lvx_util \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/internal/test_util/libcode/vx_tc_util/Makefile.in b/internal/test_util/libcode/vx_tc_util/Makefile.in index 27469fd0cc..9ba04b2a14 100644 --- a/internal/test_util/libcode/vx_tc_util/Makefile.in +++ b/internal/test_util/libcode/vx_tc_util/Makefile.in @@ -105,13 +105,16 @@ am_test_read_OBJECTS = test_read-test_read.$(OBJEXT) test_read_OBJECTS = $(am_test_read_OBJECTS) am__DEPENDENCIES_1 = test_read_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) test_read_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(test_read_LDFLAGS) $(LDFLAGS) -o $@ am_test_read_prob_OBJECTS = test_read_prob-test_read_prob.$(OBJEXT) test_read_prob_OBJECTS = $(am_test_read_prob_OBJECTS) test_read_prob_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) test_read_prob_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(test_read_prob_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -205,7 +208,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -268,12 +272,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -342,14 +348,14 @@ test_read_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ @@ -378,14 +384,14 @@ test_read_prob_LDADD = -lvx_stat_out \ -lvx_shapedata \ -lvx_util_math \ -lvx_util \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/internal/test_util/tools/Makefile.in b/internal/test_util/tools/Makefile.in index cb06354cd2..e84bca7acf 100644 --- a/internal/test_util/tools/Makefile.in +++ b/internal/test_util/tools/Makefile.in @@ -207,7 +207,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -270,12 +271,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/tools/other/Makefile.in b/internal/test_util/tools/other/Makefile.in index d69379b910..c054cf412f 100644 --- a/internal/test_util/tools/other/Makefile.in +++ b/internal/test_util/tools/other/Makefile.in @@ -207,7 +207,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -270,12 +271,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/internal/test_util/tools/other/mode_time_domain/Makefile.am b/internal/test_util/tools/other/mode_time_domain/Makefile.am index 29438855ca..417b18e870 100644 --- a/internal/test_util/tools/other/mode_time_domain/Makefile.am +++ b/internal/test_util/tools/other/mode_time_domain/Makefile.am @@ -53,12 +53,12 @@ test_velocity_LDADD = \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/internal/test_util/tools/other/mode_time_domain/Makefile.in b/internal/test_util/tools/other/mode_time_domain/Makefile.in index 808f763421..0af33ce21d 100644 --- a/internal/test_util/tools/other/mode_time_domain/Makefile.in +++ b/internal/test_util/tools/other/mode_time_domain/Makefile.in @@ -128,7 +128,8 @@ test_velocity_DEPENDENCIES = ${top_builddir}/src/tools/other/mode_time_domain/mt ${top_builddir}/src/tools/other/mode_time_domain/mtd-nc_grid.o \ ${top_builddir}/src/tools/other/mode_time_domain/mtd-nc_utils_local.o \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) test_velocity_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(test_velocity_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -221,7 +222,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -284,12 +286,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -388,12 +392,12 @@ test_velocity_LDADD = \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/scripts/Rscripts/Makefile.in b/scripts/Rscripts/Makefile.in index f93285ac11..fa8e805787 100644 --- a/scripts/Rscripts/Makefile.in +++ b/scripts/Rscripts/Makefile.in @@ -237,7 +237,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -300,12 +301,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/scripts/Rscripts/include/Makefile.in b/scripts/Rscripts/include/Makefile.in index 7c544e9cfa..5d625c4e28 100644 --- a/scripts/Rscripts/include/Makefile.in +++ b/scripts/Rscripts/include/Makefile.in @@ -179,7 +179,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -242,12 +243,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/scripts/python/Makefile.in b/scripts/python/Makefile.in index efe0b382a2..e45eb05cd4 100644 --- a/scripts/python/Makefile.in +++ b/scripts/python/Makefile.in @@ -209,7 +209,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -272,12 +273,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/scripts/python/examples/Makefile.in b/scripts/python/examples/Makefile.in index a9f2a8db6d..1d4a58cadf 100644 --- a/scripts/python/examples/Makefile.in +++ b/scripts/python/examples/Makefile.in @@ -181,7 +181,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -244,12 +245,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/scripts/python/met/Makefile.in b/scripts/python/met/Makefile.in index 490d264ca8..fea84eace6 100644 --- a/scripts/python/met/Makefile.in +++ b/scripts/python/met/Makefile.in @@ -181,7 +181,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -244,12 +245,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/scripts/python/pyembed/Makefile.in b/scripts/python/pyembed/Makefile.in index 20ee6e37a6..f325661122 100644 --- a/scripts/python/pyembed/Makefile.in +++ b/scripts/python/pyembed/Makefile.in @@ -237,7 +237,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -300,12 +301,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/scripts/python/tc_diag/Makefile.in b/scripts/python/tc_diag/Makefile.in index 06f83a422c..a7d94424b3 100644 --- a/scripts/python/tc_diag/Makefile.in +++ b/scripts/python/tc_diag/Makefile.in @@ -181,7 +181,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -244,12 +245,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/scripts/python/utility/Makefile.in b/scripts/python/utility/Makefile.in index fdeda94c3a..4c379b52a6 100644 --- a/scripts/python/utility/Makefile.in +++ b/scripts/python/utility/Makefile.in @@ -181,7 +181,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -244,12 +245,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/Makefile.in b/src/Makefile.in index f4f8e40a3e..175bb0381a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -207,7 +207,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -270,12 +271,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/basic/Makefile.in b/src/basic/Makefile.in index 95eaedfe15..1df9e615ba 100644 --- a/src/basic/Makefile.in +++ b/src/basic/Makefile.in @@ -209,7 +209,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -272,12 +273,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/basic/enum_to_string/Makefile.in b/src/basic/enum_to_string/Makefile.in index d16174451b..6c1a9607bf 100644 --- a/src/basic/enum_to_string/Makefile.in +++ b/src/basic/enum_to_string/Makefile.in @@ -226,7 +226,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -289,12 +290,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/basic/vx_cal/Makefile.in b/src/basic/vx_cal/Makefile.in index 0d3317fbf5..a80d944f0a 100644 --- a/src/basic/vx_cal/Makefile.in +++ b/src/basic/vx_cal/Makefile.in @@ -233,7 +233,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -296,12 +297,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/basic/vx_config/Makefile.in b/src/basic/vx_config/Makefile.in index 4ff54d234f..5fddc64397 100644 --- a/src/basic/vx_config/Makefile.in +++ b/src/basic/vx_config/Makefile.in @@ -281,7 +281,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -344,12 +345,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/basic/vx_log/Makefile.in b/src/basic/vx_log/Makefile.in index 0ac20c1bf6..bfbfb1c4b6 100644 --- a/src/basic/vx_log/Makefile.in +++ b/src/basic/vx_log/Makefile.in @@ -212,7 +212,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -275,12 +276,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/basic/vx_math/Makefile.in b/src/basic/vx_math/Makefile.in index 93de6cd207..f42012d3ea 100644 --- a/src/basic/vx_math/Makefile.in +++ b/src/basic/vx_math/Makefile.in @@ -226,7 +226,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -289,12 +290,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/basic/vx_util/Makefile.in b/src/basic/vx_util/Makefile.in index 8d17edbdec..83579ba1b4 100644 --- a/src/basic/vx_util/Makefile.in +++ b/src/basic/vx_util/Makefile.in @@ -331,7 +331,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -394,12 +395,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/basic/vx_util_math/Makefile.in b/src/basic/vx_util_math/Makefile.in index e7a6b3ee26..bd06680091 100644 --- a/src/basic/vx_util_math/Makefile.in +++ b/src/basic/vx_util_math/Makefile.in @@ -211,7 +211,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -274,12 +275,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/Makefile.in b/src/libcode/Makefile.in index 4afd84dc2a..4af407ca04 100644 --- a/src/libcode/Makefile.in +++ b/src/libcode/Makefile.in @@ -219,7 +219,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -282,12 +283,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_afm/Makefile.in b/src/libcode/vx_afm/Makefile.in index 158c8e5870..27f3023563 100644 --- a/src/libcode/vx_afm/Makefile.in +++ b/src/libcode/vx_afm/Makefile.in @@ -220,7 +220,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -283,12 +284,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_analysis_util/Makefile.in b/src/libcode/vx_analysis_util/Makefile.in index 1cb02f933d..10bbb3aea6 100644 --- a/src/libcode/vx_analysis_util/Makefile.in +++ b/src/libcode/vx_analysis_util/Makefile.in @@ -227,7 +227,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -290,12 +291,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_bool_calc/Makefile.in b/src/libcode/vx_bool_calc/Makefile.in index 4bea416042..07bead994d 100644 --- a/src/libcode/vx_bool_calc/Makefile.in +++ b/src/libcode/vx_bool_calc/Makefile.in @@ -222,7 +222,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -285,12 +286,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_color/Makefile.in b/src/libcode/vx_color/Makefile.in index e196db5d71..08977daff3 100644 --- a/src/libcode/vx_color/Makefile.in +++ b/src/libcode/vx_color/Makefile.in @@ -239,7 +239,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -302,12 +303,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_data2d/Makefile.in b/src/libcode/vx_data2d/Makefile.in index d6f8e4443b..f3229e9a6a 100644 --- a/src/libcode/vx_data2d/Makefile.in +++ b/src/libcode/vx_data2d/Makefile.in @@ -222,7 +222,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -285,12 +286,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_data2d_factory/Makefile.in b/src/libcode/vx_data2d_factory/Makefile.in index 23ec4de70c..e9254cb32b 100644 --- a/src/libcode/vx_data2d_factory/Makefile.in +++ b/src/libcode/vx_data2d_factory/Makefile.in @@ -225,7 +225,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -288,12 +289,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_data2d_grib/Makefile.in b/src/libcode/vx_data2d_grib/Makefile.in index aede07a3ab..684bfa9d81 100644 --- a/src/libcode/vx_data2d_grib/Makefile.in +++ b/src/libcode/vx_data2d_grib/Makefile.in @@ -222,7 +222,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -285,12 +286,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_data2d_grib2/Makefile.in b/src/libcode/vx_data2d_grib2/Makefile.in index 3fb8053b10..e26d1e102b 100644 --- a/src/libcode/vx_data2d_grib2/Makefile.in +++ b/src/libcode/vx_data2d_grib2/Makefile.in @@ -215,7 +215,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -278,12 +279,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_data2d_nc_met/Makefile.in b/src/libcode/vx_data2d_nc_met/Makefile.in index a830b5d0cc..e160b86a38 100644 --- a/src/libcode/vx_data2d_nc_met/Makefile.in +++ b/src/libcode/vx_data2d_nc_met/Makefile.in @@ -219,7 +219,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -282,12 +283,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_data2d_nc_pinterp/Makefile.in b/src/libcode/vx_data2d_nc_pinterp/Makefile.in index 190267e3d6..867c42b48a 100644 --- a/src/libcode/vx_data2d_nc_pinterp/Makefile.in +++ b/src/libcode/vx_data2d_nc_pinterp/Makefile.in @@ -220,7 +220,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -283,12 +284,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_data2d_nccf/Makefile.in b/src/libcode/vx_data2d_nccf/Makefile.in index d44d8a177c..881177942a 100644 --- a/src/libcode/vx_data2d_nccf/Makefile.in +++ b/src/libcode/vx_data2d_nccf/Makefile.in @@ -216,7 +216,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -279,12 +280,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_data2d_python/Makefile.in b/src/libcode/vx_data2d_python/Makefile.in index 0740800a11..cf782561fc 100644 --- a/src/libcode/vx_data2d_python/Makefile.in +++ b/src/libcode/vx_data2d_python/Makefile.in @@ -223,7 +223,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -286,12 +287,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_data2d_ugrid/Makefile.in b/src/libcode/vx_data2d_ugrid/Makefile.in index d21f71256c..7712baafe9 100644 --- a/src/libcode/vx_data2d_ugrid/Makefile.in +++ b/src/libcode/vx_data2d_ugrid/Makefile.in @@ -217,7 +217,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -280,12 +281,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_geodesy/Makefile.in b/src/libcode/vx_geodesy/Makefile.in index 8d44ccc5ee..25a281b257 100644 --- a/src/libcode/vx_geodesy/Makefile.in +++ b/src/libcode/vx_geodesy/Makefile.in @@ -211,7 +211,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -274,12 +275,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_gis/Makefile.in b/src/libcode/vx_gis/Makefile.in index 8960a31f2c..a382caa1d3 100644 --- a/src/libcode/vx_gis/Makefile.in +++ b/src/libcode/vx_gis/Makefile.in @@ -220,7 +220,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -283,12 +284,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_gnomon/Makefile.in b/src/libcode/vx_gnomon/Makefile.in index 6c4fc1cafc..adec4f8fb1 100644 --- a/src/libcode/vx_gnomon/Makefile.in +++ b/src/libcode/vx_gnomon/Makefile.in @@ -211,7 +211,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -274,12 +275,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_grid/Makefile.in b/src/libcode/vx_grid/Makefile.in index 0bdd8ad913..99bb769bf1 100644 --- a/src/libcode/vx_grid/Makefile.in +++ b/src/libcode/vx_grid/Makefile.in @@ -253,7 +253,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -316,12 +317,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_gsl_prob/Makefile.in b/src/libcode/vx_gsl_prob/Makefile.in index 1e9771e5f9..e3ca39e845 100644 --- a/src/libcode/vx_gsl_prob/Makefile.in +++ b/src/libcode/vx_gsl_prob/Makefile.in @@ -219,7 +219,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -282,12 +283,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_nav/Makefile.in b/src/libcode/vx_nav/Makefile.in index cac853b6a3..e91a581ff9 100644 --- a/src/libcode/vx_nav/Makefile.in +++ b/src/libcode/vx_nav/Makefile.in @@ -211,7 +211,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -274,12 +275,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_nc_obs/Makefile.in b/src/libcode/vx_nc_obs/Makefile.in index 49c7bca263..b88b793888 100644 --- a/src/libcode/vx_nc_obs/Makefile.in +++ b/src/libcode/vx_nc_obs/Makefile.in @@ -221,7 +221,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -284,12 +285,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_nc_util/Makefile.in b/src/libcode/vx_nc_util/Makefile.in index dc24786069..9843b5647b 100644 --- a/src/libcode/vx_nc_util/Makefile.in +++ b/src/libcode/vx_nc_util/Makefile.in @@ -219,7 +219,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -282,12 +283,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_pb_util/Makefile.in b/src/libcode/vx_pb_util/Makefile.in index 5ac023f347..4155cbd87d 100644 --- a/src/libcode/vx_pb_util/Makefile.in +++ b/src/libcode/vx_pb_util/Makefile.in @@ -217,7 +217,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -280,12 +281,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_physics/Makefile.in b/src/libcode/vx_physics/Makefile.in index 9e7a7773fe..4a92b393e6 100644 --- a/src/libcode/vx_physics/Makefile.in +++ b/src/libcode/vx_physics/Makefile.in @@ -211,7 +211,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -274,12 +275,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_plot_util/Makefile.in b/src/libcode/vx_plot_util/Makefile.in index 8aba77a5a0..b04ac2aff8 100644 --- a/src/libcode/vx_plot_util/Makefile.in +++ b/src/libcode/vx_plot_util/Makefile.in @@ -216,7 +216,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -279,12 +280,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_pointdata_python/Makefile.in b/src/libcode/vx_pointdata_python/Makefile.in index 4ed8d85e76..ef7b4a4c67 100644 --- a/src/libcode/vx_pointdata_python/Makefile.in +++ b/src/libcode/vx_pointdata_python/Makefile.in @@ -220,7 +220,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -283,12 +284,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_ps/Makefile.in b/src/libcode/vx_ps/Makefile.in index 87ade543e6..9f1f61d8d9 100644 --- a/src/libcode/vx_ps/Makefile.in +++ b/src/libcode/vx_ps/Makefile.in @@ -221,7 +221,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -284,12 +285,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_pxm/Makefile.in b/src/libcode/vx_pxm/Makefile.in index befe52399a..9f78c084cc 100644 --- a/src/libcode/vx_pxm/Makefile.in +++ b/src/libcode/vx_pxm/Makefile.in @@ -218,7 +218,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -281,12 +282,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_python3_utils/Makefile.in b/src/libcode/vx_python3_utils/Makefile.in index 6743616a88..625aeafb9a 100644 --- a/src/libcode/vx_python3_utils/Makefile.in +++ b/src/libcode/vx_python3_utils/Makefile.in @@ -224,7 +224,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -287,12 +288,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_regrid/Makefile.in b/src/libcode/vx_regrid/Makefile.in index f91ba4b770..dacbe937e9 100644 --- a/src/libcode/vx_regrid/Makefile.in +++ b/src/libcode/vx_regrid/Makefile.in @@ -213,7 +213,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -276,12 +277,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_render/Makefile.in b/src/libcode/vx_render/Makefile.in index 02894f2e4b..54ad601137 100644 --- a/src/libcode/vx_render/Makefile.in +++ b/src/libcode/vx_render/Makefile.in @@ -235,7 +235,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -298,12 +299,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_seeps/Makefile.in b/src/libcode/vx_seeps/Makefile.in index ffea58f62a..0fabf3df09 100644 --- a/src/libcode/vx_seeps/Makefile.in +++ b/src/libcode/vx_seeps/Makefile.in @@ -211,7 +211,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -274,12 +275,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_series_data/Makefile.in b/src/libcode/vx_series_data/Makefile.in index 1054d5ab8c..897d818054 100644 --- a/src/libcode/vx_series_data/Makefile.in +++ b/src/libcode/vx_series_data/Makefile.in @@ -214,7 +214,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -277,12 +278,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_shapedata/Makefile.in b/src/libcode/vx_shapedata/Makefile.in index 593b779872..df218fceda 100644 --- a/src/libcode/vx_shapedata/Makefile.in +++ b/src/libcode/vx_shapedata/Makefile.in @@ -227,7 +227,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -290,12 +291,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_solar/Makefile.in b/src/libcode/vx_solar/Makefile.in index 8f783ba458..3d12890618 100644 --- a/src/libcode/vx_solar/Makefile.in +++ b/src/libcode/vx_solar/Makefile.in @@ -213,7 +213,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -276,12 +277,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_stat_out/Makefile.in b/src/libcode/vx_stat_out/Makefile.in index f701fe7d50..d12b414cf1 100644 --- a/src/libcode/vx_stat_out/Makefile.in +++ b/src/libcode/vx_stat_out/Makefile.in @@ -213,7 +213,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -276,12 +277,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_statistics/Makefile.in b/src/libcode/vx_statistics/Makefile.in index f0e0461d01..dbd2500d6a 100644 --- a/src/libcode/vx_statistics/Makefile.in +++ b/src/libcode/vx_statistics/Makefile.in @@ -238,7 +238,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -301,12 +302,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_summary/Makefile.in b/src/libcode/vx_summary/Makefile.in index d39a9130b4..6c057f2622 100644 --- a/src/libcode/vx_summary/Makefile.in +++ b/src/libcode/vx_summary/Makefile.in @@ -233,7 +233,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -296,12 +297,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_tc_util/Makefile.in b/src/libcode/vx_tc_util/Makefile.in index fe11bd49c1..747df71532 100644 --- a/src/libcode/vx_tc_util/Makefile.in +++ b/src/libcode/vx_tc_util/Makefile.in @@ -247,7 +247,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -310,12 +311,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/libcode/vx_time_series/Makefile.in b/src/libcode/vx_time_series/Makefile.in index 11395a5226..a5eacf5ac7 100644 --- a/src/libcode/vx_time_series/Makefile.in +++ b/src/libcode/vx_time_series/Makefile.in @@ -215,7 +215,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -278,12 +279,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in index 3cfab2a262..c9b6f05b61 100644 --- a/src/tools/Makefile.in +++ b/src/tools/Makefile.in @@ -209,7 +209,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -272,12 +273,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/core/Makefile.in b/src/tools/core/Makefile.in index 7eca6731e2..6e18774f39 100644 --- a/src/tools/core/Makefile.in +++ b/src/tools/core/Makefile.in @@ -217,7 +217,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -280,12 +281,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/core/ensemble_stat/Makefile.am b/src/tools/core/ensemble_stat/Makefile.am index e3bbed953c..e43f8c4498 100644 --- a/src/tools/core/ensemble_stat/Makefile.am +++ b/src/tools/core/ensemble_stat/Makefile.am @@ -22,11 +22,11 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_seeps \ @@ -42,7 +42,7 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = ensemble_stat.h \ diff --git a/src/tools/core/ensemble_stat/Makefile.in b/src/tools/core/ensemble_stat/Makefile.in index 05022c8d16..8da27fb9e6 100644 --- a/src/tools/core/ensemble_stat/Makefile.in +++ b/src/tools/core/ensemble_stat/Makefile.in @@ -106,6 +106,8 @@ am_ensemble_stat_OBJECTS = ensemble_stat-ensemble_stat.$(OBJEXT) \ ensemble_stat_OBJECTS = $(am_ensemble_stat_OBJECTS) am__DEPENDENCIES_1 = ensemble_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) ensemble_stat_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ @@ -201,7 +203,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -264,12 +267,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -339,11 +344,11 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_seeps \ @@ -359,7 +364,7 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = ensemble_stat.h \ diff --git a/src/tools/core/grid_stat/Makefile.am b/src/tools/core/grid_stat/Makefile.am index fd5fc5ab9b..72c5fd757b 100644 --- a/src/tools/core/grid_stat/Makefile.am +++ b/src/tools/core/grid_stat/Makefile.am @@ -22,11 +22,11 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/grid_stat/Makefile.in b/src/tools/core/grid_stat/Makefile.in index a1d736fb93..d665e98f51 100644 --- a/src/tools/core/grid_stat/Makefile.in +++ b/src/tools/core/grid_stat/Makefile.in @@ -106,7 +106,8 @@ am_grid_stat_OBJECTS = grid_stat-grid_stat.$(OBJEXT) \ grid_stat_OBJECTS = $(am_grid_stat_OBJECTS) am__DEPENDENCIES_1 = grid_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) grid_stat_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(grid_stat_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -200,7 +201,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -263,12 +265,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -338,11 +342,11 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/mode/Makefile.am b/src/tools/core/mode/Makefile.am index a80f2fc12e..d56e531cc9 100644 --- a/src/tools/core/mode/Makefile.am +++ b/src/tools/core/mode/Makefile.am @@ -41,11 +41,11 @@ mode_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/mode/Makefile.in b/src/tools/core/mode/Makefile.in index deec72de8d..9c1f34be1e 100644 --- a/src/tools/core/mode/Makefile.in +++ b/src/tools/core/mode/Makefile.in @@ -113,7 +113,8 @@ am_mode_OBJECTS = mode-mode_usage.$(OBJEXT) \ mode_OBJECTS = $(am_mode_OBJECTS) am__DEPENDENCIES_1 = mode_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) mode_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(mode_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -218,7 +219,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -281,12 +283,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -375,11 +379,11 @@ mode_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/mode_analysis/Makefile.am b/src/tools/core/mode_analysis/Makefile.am index e3a27adeed..bfb73b89f8 100644 --- a/src/tools/core/mode_analysis/Makefile.am +++ b/src/tools/core/mode_analysis/Makefile.am @@ -22,15 +22,15 @@ mode_analysis_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/src/tools/core/mode_analysis/Makefile.in b/src/tools/core/mode_analysis/Makefile.in index 5ab89d8c41..8040d5da85 100644 --- a/src/tools/core/mode_analysis/Makefile.in +++ b/src/tools/core/mode_analysis/Makefile.in @@ -106,6 +106,8 @@ am_mode_analysis_OBJECTS = mode_analysis-mode_analysis.$(OBJEXT) \ mode_analysis_OBJECTS = $(am_mode_analysis_OBJECTS) am__DEPENDENCIES_1 = mode_analysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) mode_analysis_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ @@ -201,7 +203,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -264,12 +267,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -339,15 +344,15 @@ mode_analysis_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/src/tools/core/pcp_combine/Makefile.am b/src/tools/core/pcp_combine/Makefile.am index 1059c3d4ad..06867a5dd4 100644 --- a/src/tools/core/pcp_combine/Makefile.am +++ b/src/tools/core/pcp_combine/Makefile.am @@ -16,11 +16,11 @@ pcp_combine_CPPFLAGS = ${MET_CPPFLAGS} pcp_combine_LDFLAGS = ${MET_LDFLAGS} pcp_combine_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/core/pcp_combine/Makefile.in b/src/tools/core/pcp_combine/Makefile.in index ef5e070bdc..6c1cb2d5b5 100644 --- a/src/tools/core/pcp_combine/Makefile.in +++ b/src/tools/core/pcp_combine/Makefile.in @@ -105,7 +105,8 @@ am_pcp_combine_OBJECTS = pcp_combine-pcp_combine.$(OBJEXT) pcp_combine_OBJECTS = $(am_pcp_combine_OBJECTS) am__DEPENDENCIES_1 = pcp_combine_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) pcp_combine_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(pcp_combine_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -198,7 +199,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -261,12 +263,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -329,11 +333,11 @@ pcp_combine_CPPFLAGS = ${MET_CPPFLAGS} pcp_combine_LDFLAGS = ${MET_LDFLAGS} pcp_combine_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/core/point_stat/Makefile.am b/src/tools/core/point_stat/Makefile.am index 9c0bbbfe50..58f9c65ca5 100644 --- a/src/tools/core/point_stat/Makefile.am +++ b/src/tools/core/point_stat/Makefile.am @@ -21,11 +21,11 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_seeps \ @@ -42,7 +42,7 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = point_stat.h \ diff --git a/src/tools/core/point_stat/Makefile.in b/src/tools/core/point_stat/Makefile.in index 6f8bfe91b6..219ac780cd 100644 --- a/src/tools/core/point_stat/Makefile.in +++ b/src/tools/core/point_stat/Makefile.in @@ -106,6 +106,8 @@ am_point_stat_OBJECTS = point_stat-point_stat.$(OBJEXT) \ point_stat_OBJECTS = $(am_point_stat_OBJECTS) am__DEPENDENCIES_1 = point_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) point_stat_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(point_stat_LDFLAGS) $(LDFLAGS) -o $@ @@ -200,7 +202,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -263,12 +266,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -337,11 +342,11 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_seeps \ @@ -358,7 +363,7 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = point_stat.h \ diff --git a/src/tools/core/series_analysis/Makefile.am b/src/tools/core/series_analysis/Makefile.am index 1137a3e76c..9d67af74b8 100644 --- a/src/tools/core/series_analysis/Makefile.am +++ b/src/tools/core/series_analysis/Makefile.am @@ -22,11 +22,11 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/series_analysis/Makefile.in b/src/tools/core/series_analysis/Makefile.in index c45f2828c9..1ec02b0ca0 100644 --- a/src/tools/core/series_analysis/Makefile.in +++ b/src/tools/core/series_analysis/Makefile.in @@ -107,7 +107,9 @@ am_series_analysis_OBJECTS = \ series_analysis_OBJECTS = $(am_series_analysis_OBJECTS) am__DEPENDENCIES_1 = series_analysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) series_analysis_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(series_analysis_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -201,7 +203,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -264,12 +267,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -339,11 +344,11 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/stat_analysis/Makefile.am b/src/tools/core/stat_analysis/Makefile.am index 126538a295..aa3561f2b5 100644 --- a/src/tools/core/stat_analysis/Makefile.am +++ b/src/tools/core/stat_analysis/Makefile.am @@ -25,11 +25,11 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_gsl_prob \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/stat_analysis/Makefile.in b/src/tools/core/stat_analysis/Makefile.in index c7237f62c0..230c331ac7 100644 --- a/src/tools/core/stat_analysis/Makefile.in +++ b/src/tools/core/stat_analysis/Makefile.in @@ -109,7 +109,9 @@ am_stat_analysis_OBJECTS = stat_analysis-stat_analysis.$(OBJEXT) \ stat_analysis_OBJECTS = $(am_stat_analysis_OBJECTS) am__DEPENDENCIES_1 = stat_analysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) stat_analysis_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(stat_analysis_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -206,7 +208,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -269,12 +272,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -347,11 +352,11 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_gsl_prob \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/wavelet_stat/Makefile.am b/src/tools/core/wavelet_stat/Makefile.am index 6d9e6f2cf7..ca63fadb38 100644 --- a/src/tools/core/wavelet_stat/Makefile.am +++ b/src/tools/core/wavelet_stat/Makefile.am @@ -28,11 +28,11 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/core/wavelet_stat/Makefile.in b/src/tools/core/wavelet_stat/Makefile.in index d90c9b82bd..568d90a937 100644 --- a/src/tools/core/wavelet_stat/Makefile.in +++ b/src/tools/core/wavelet_stat/Makefile.in @@ -106,7 +106,9 @@ am_wavelet_stat_OBJECTS = wavelet_stat-wavelet_stat.$(OBJEXT) \ wavelet_stat_OBJECTS = $(am_wavelet_stat_OBJECTS) am__DEPENDENCIES_1 = wavelet_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) wavelet_stat_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(wavelet_stat_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -200,7 +202,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -263,12 +266,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -344,11 +349,11 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/dev_utils/Makefile.am b/src/tools/dev_utils/Makefile.am index dbba4d21ee..f823bb0ab7 100644 --- a/src/tools/dev_utils/Makefile.am +++ b/src/tools/dev_utils/Makefile.am @@ -124,11 +124,11 @@ gen_climo_bin_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/dev_utils/Makefile.in b/src/tools/dev_utils/Makefile.in index 33338bc331..8f692e2e4c 100644 --- a/src/tools/dev_utils/Makefile.in +++ b/src/tools/dev_utils/Makefile.in @@ -114,7 +114,9 @@ am_gen_climo_bin_OBJECTS = gen_climo_bin-gen_climo_bin.$(OBJEXT) gen_climo_bin_OBJECTS = $(am_gen_climo_bin_OBJECTS) am__DEPENDENCIES_1 = gen_climo_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) gen_climo_bin_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(gen_climo_bin_LDFLAGS) $(LDFLAGS) -o $@ am__dirstamp = $(am__leading_dot)dirstamp @@ -343,7 +345,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -406,12 +409,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -573,11 +578,11 @@ gen_climo_bin_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/dev_utils/shapefiles/Makefile.in b/src/tools/dev_utils/shapefiles/Makefile.in index 505bb7d3cd..f5454f70fb 100644 --- a/src/tools/dev_utils/shapefiles/Makefile.in +++ b/src/tools/dev_utils/shapefiles/Makefile.in @@ -196,7 +196,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -259,12 +260,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/other/Makefile.in b/src/tools/other/Makefile.in index f7d92c8f1f..7574bf3ce1 100644 --- a/src/tools/other/Makefile.in +++ b/src/tools/other/Makefile.in @@ -229,7 +229,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -292,12 +293,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/other/ascii2nc/Makefile.am b/src/tools/other/ascii2nc/Makefile.am index 777a60c576..75eb86971d 100644 --- a/src/tools/other/ascii2nc/Makefile.am +++ b/src/tools/other/ascii2nc/Makefile.am @@ -38,11 +38,11 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_nc_util \ @@ -59,7 +59,7 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_cal \ -lvx_math \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/src/tools/other/ascii2nc/Makefile.in b/src/tools/other/ascii2nc/Makefile.in index 2a70e7684c..73d21ea2b8 100644 --- a/src/tools/other/ascii2nc/Makefile.in +++ b/src/tools/other/ascii2nc/Makefile.in @@ -128,6 +128,8 @@ am_ascii2nc_OBJECTS = ascii2nc-ascii2nc.$(OBJEXT) \ ascii2nc_OBJECTS = $(am_ascii2nc_OBJECTS) am__DEPENDENCIES_1 = ascii2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ascii2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(ascii2nc_LDFLAGS) $(LDFLAGS) -o $@ @@ -245,7 +247,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -308,12 +311,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -393,11 +398,11 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_nc_util \ @@ -414,7 +419,7 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_cal \ -lvx_math \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/src/tools/other/gen_ens_prod/Makefile.am b/src/tools/other/gen_ens_prod/Makefile.am index e1d6c399d5..464280a147 100644 --- a/src/tools/other/gen_ens_prod/Makefile.am +++ b/src/tools/other/gen_ens_prod/Makefile.am @@ -22,11 +22,11 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_seeps \ @@ -42,7 +42,7 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = gen_ens_prod.h \ diff --git a/src/tools/other/gen_ens_prod/Makefile.in b/src/tools/other/gen_ens_prod/Makefile.in index acbf1aa3d1..cadbf4ce6e 100644 --- a/src/tools/other/gen_ens_prod/Makefile.in +++ b/src/tools/other/gen_ens_prod/Makefile.in @@ -106,6 +106,8 @@ am_gen_ens_prod_OBJECTS = gen_ens_prod-gen_ens_prod.$(OBJEXT) \ gen_ens_prod_OBJECTS = $(am_gen_ens_prod_OBJECTS) am__DEPENDENCIES_1 = gen_ens_prod_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) gen_ens_prod_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ @@ -201,7 +203,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -264,12 +267,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -339,11 +344,11 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_seeps \ @@ -359,7 +364,7 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = gen_ens_prod.h \ diff --git a/src/tools/other/gen_vx_mask/Makefile.am b/src/tools/other/gen_vx_mask/Makefile.am index 5daca1fbf9..818b9a2a55 100644 --- a/src/tools/other/gen_vx_mask/Makefile.am +++ b/src/tools/other/gen_vx_mask/Makefile.am @@ -19,11 +19,11 @@ gen_vx_mask_LDADD = -lvx_shapedata \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_gis \ -lvx_nc_util \ diff --git a/src/tools/other/gen_vx_mask/Makefile.in b/src/tools/other/gen_vx_mask/Makefile.in index d6d917b4ce..0ec4c42fa4 100644 --- a/src/tools/other/gen_vx_mask/Makefile.in +++ b/src/tools/other/gen_vx_mask/Makefile.in @@ -105,7 +105,8 @@ am_gen_vx_mask_OBJECTS = gen_vx_mask-gen_vx_mask.$(OBJEXT) gen_vx_mask_OBJECTS = $(am_gen_vx_mask_OBJECTS) am__DEPENDENCIES_1 = gen_vx_mask_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) gen_vx_mask_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(gen_vx_mask_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -198,7 +199,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -261,12 +263,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -331,11 +335,11 @@ gen_vx_mask_LDADD = -lvx_shapedata \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_gis \ -lvx_nc_util \ diff --git a/src/tools/other/gis_utils/Makefile.in b/src/tools/other/gis_utils/Makefile.in index fe326f0a56..aa3780a9bc 100644 --- a/src/tools/other/gis_utils/Makefile.in +++ b/src/tools/other/gis_utils/Makefile.in @@ -211,7 +211,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -274,12 +275,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/other/grid_diag/Makefile.am b/src/tools/other/grid_diag/Makefile.am index b1b2a04e49..39cc66e20a 100644 --- a/src/tools/other/grid_diag/Makefile.am +++ b/src/tools/other/grid_diag/Makefile.am @@ -22,11 +22,11 @@ grid_diag_LDADD = -lvx_stat_out \ -lvx_series_data \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/grid_diag/Makefile.in b/src/tools/other/grid_diag/Makefile.in index 37b1416506..3e0f9a8e1c 100644 --- a/src/tools/other/grid_diag/Makefile.in +++ b/src/tools/other/grid_diag/Makefile.in @@ -106,7 +106,8 @@ am_grid_diag_OBJECTS = grid_diag-grid_diag.$(OBJEXT) \ grid_diag_OBJECTS = $(am_grid_diag_OBJECTS) am__DEPENDENCIES_1 = grid_diag_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) grid_diag_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(grid_diag_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -200,7 +201,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -263,12 +265,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -338,11 +342,11 @@ grid_diag_LDADD = -lvx_stat_out \ -lvx_series_data \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/gsi_tools/Makefile.am b/src/tools/other/gsi_tools/Makefile.am index a0a76cb940..0240814df5 100644 --- a/src/tools/other/gsi_tools/Makefile.am +++ b/src/tools/other/gsi_tools/Makefile.am @@ -37,15 +37,15 @@ gsid2mpr_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_LIBS) \ - $(UGRID_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_data2d \ -lvx_seeps \ -lvx_nc_util \ @@ -87,15 +87,15 @@ gsidens2orank_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_LIBS) \ - $(UGRID_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_data2d \ -lvx_seeps \ -lvx_nc_util \ diff --git a/src/tools/other/gsi_tools/Makefile.in b/src/tools/other/gsi_tools/Makefile.in index cee43762e6..468aab31bc 100644 --- a/src/tools/other/gsi_tools/Makefile.in +++ b/src/tools/other/gsi_tools/Makefile.in @@ -108,6 +108,8 @@ am_gsid2mpr_OBJECTS = gsid2mpr-gsi_record.$(OBJEXT) \ gsid2mpr_OBJECTS = $(am_gsid2mpr_OBJECTS) am__DEPENDENCIES_1 = gsid2mpr_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) gsid2mpr_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(gsid2mpr_LDFLAGS) $(LDFLAGS) -o $@ @@ -119,6 +121,8 @@ am_gsidens2orank_OBJECTS = gsidens2orank-gsi_record.$(OBJEXT) \ gsidens2orank-rad_config.$(OBJEXT) gsidens2orank_OBJECTS = $(am_gsidens2orank_OBJECTS) gsidens2orank_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) gsidens2orank_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ @@ -236,7 +240,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -299,12 +304,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -387,15 +394,15 @@ gsid2mpr_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_LIBS) \ - $(UGRID_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_data2d \ -lvx_seeps \ -lvx_nc_util \ @@ -438,15 +445,15 @@ gsidens2orank_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_LIBS) \ - $(UGRID_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_data2d \ -lvx_seeps \ -lvx_nc_util \ diff --git a/src/tools/other/ioda2nc/Makefile.am b/src/tools/other/ioda2nc/Makefile.am index d34bd36eb5..1ed02ca762 100644 --- a/src/tools/other/ioda2nc/Makefile.am +++ b/src/tools/other/ioda2nc/Makefile.am @@ -21,11 +21,11 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_nc_util \ @@ -42,7 +42,7 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \ $(FLIBS) diff --git a/src/tools/other/ioda2nc/Makefile.in b/src/tools/other/ioda2nc/Makefile.in index 707a76cd3e..6a920cef5c 100644 --- a/src/tools/other/ioda2nc/Makefile.in +++ b/src/tools/other/ioda2nc/Makefile.in @@ -106,6 +106,8 @@ am_ioda2nc_OBJECTS = ioda2nc-ioda2nc.$(OBJEXT) \ ioda2nc_OBJECTS = $(am_ioda2nc_OBJECTS) am__DEPENDENCIES_1 = ioda2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) ioda2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(ioda2nc_LDFLAGS) \ @@ -213,7 +215,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -276,12 +279,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -350,11 +355,11 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_nc_util \ @@ -371,7 +376,7 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \ $(FLIBS) diff --git a/src/tools/other/lidar2nc/Makefile.am b/src/tools/other/lidar2nc/Makefile.am index 0bbe09fb4f..6a51c3224a 100644 --- a/src/tools/other/lidar2nc/Makefile.am +++ b/src/tools/other/lidar2nc/Makefile.am @@ -24,9 +24,9 @@ lidar2nc_LDADD = -lvx_shapedata \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_nc_obs \ -lvx_nc_util \ @@ -52,7 +52,7 @@ lidar2nc_LDADD = -lvx_shapedata \ -lvx_cal \ -lvx_log \ -lvx_util \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_summary \ -lmfhdf -ldf -ljpeg \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz diff --git a/src/tools/other/lidar2nc/Makefile.in b/src/tools/other/lidar2nc/Makefile.in index ac1d193ba3..ca596d443f 100644 --- a/src/tools/other/lidar2nc/Makefile.in +++ b/src/tools/other/lidar2nc/Makefile.in @@ -106,7 +106,8 @@ am_lidar2nc_OBJECTS = lidar2nc-lidar2nc.$(OBJEXT) \ lidar2nc_OBJECTS = $(am_lidar2nc_OBJECTS) am__DEPENDENCIES_1 = lidar2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) lidar2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(lidar2nc_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -213,7 +214,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -276,12 +278,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -354,9 +358,9 @@ lidar2nc_LDADD = -lvx_shapedata \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_nc_obs \ -lvx_nc_util \ @@ -382,7 +386,7 @@ lidar2nc_LDADD = -lvx_shapedata \ -lvx_cal \ -lvx_log \ -lvx_util \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_summary \ -lmfhdf -ldf -ljpeg \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz diff --git a/src/tools/other/madis2nc/Makefile.am b/src/tools/other/madis2nc/Makefile.am index 9176924ec0..2763c9e6cd 100644 --- a/src/tools/other/madis2nc/Makefile.am +++ b/src/tools/other/madis2nc/Makefile.am @@ -20,11 +20,11 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_nc_util \ @@ -41,7 +41,7 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = madis2nc.h \ diff --git a/src/tools/other/madis2nc/Makefile.in b/src/tools/other/madis2nc/Makefile.in index 8450b07247..fdcf482c19 100644 --- a/src/tools/other/madis2nc/Makefile.in +++ b/src/tools/other/madis2nc/Makefile.in @@ -106,6 +106,8 @@ am_madis2nc_OBJECTS = madis2nc-madis2nc.$(OBJEXT) \ madis2nc_OBJECTS = $(am_madis2nc_OBJECTS) am__DEPENDENCIES_1 = madis2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) madis2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(madis2nc_LDFLAGS) $(LDFLAGS) -o $@ @@ -200,7 +202,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -263,12 +266,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -335,11 +340,11 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_nc_util \ @@ -356,7 +361,7 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = madis2nc.h \ diff --git a/src/tools/other/mode_graphics/Makefile.am b/src/tools/other/mode_graphics/Makefile.am index 7b6625f885..7c680e38a9 100644 --- a/src/tools/other/mode_graphics/Makefile.am +++ b/src/tools/other/mode_graphics/Makefile.am @@ -26,8 +26,8 @@ plot_mode_field_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_plot_util \ -lvx_data2d_nc_met \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_grid \ -lvx_geodesy \ diff --git a/src/tools/other/mode_graphics/Makefile.in b/src/tools/other/mode_graphics/Makefile.in index 5625b71f0a..90eb29de55 100644 --- a/src/tools/other/mode_graphics/Makefile.in +++ b/src/tools/other/mode_graphics/Makefile.in @@ -111,6 +111,7 @@ am_plot_mode_field_OBJECTS = \ plot_mode_field_OBJECTS = $(am_plot_mode_field_OBJECTS) am__DEPENDENCIES_1 = plot_mode_field_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) plot_mode_field_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(plot_mode_field_LDFLAGS) $(LDFLAGS) -o $@ @@ -221,7 +222,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -284,12 +286,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -362,8 +366,8 @@ plot_mode_field_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_plot_util \ -lvx_data2d_nc_met \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_grid \ -lvx_geodesy \ diff --git a/src/tools/other/mode_time_domain/Makefile.am b/src/tools/other/mode_time_domain/Makefile.am index 2ec931dccc..a3f5123627 100644 --- a/src/tools/other/mode_time_domain/Makefile.am +++ b/src/tools/other/mode_time_domain/Makefile.am @@ -51,11 +51,11 @@ mtd_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/mode_time_domain/Makefile.in b/src/tools/other/mode_time_domain/Makefile.in index 7c0796b94c..0caa6cd740 100644 --- a/src/tools/other/mode_time_domain/Makefile.in +++ b/src/tools/other/mode_time_domain/Makefile.in @@ -117,7 +117,8 @@ am_mtd_OBJECTS = mtd-mtd.$(OBJEXT) mtd-mtdfiletype_to_string.$(OBJEXT) \ mtd_OBJECTS = $(am_mtd_OBJECTS) am__DEPENDENCIES_1 = mtd_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) mtd_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(mtd_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -239,7 +240,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -302,12 +304,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -407,11 +411,11 @@ mtd_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/modis_regrid/Makefile.am b/src/tools/other/modis_regrid/Makefile.am index 3015d3df30..66fda6b206 100644 --- a/src/tools/other/modis_regrid/Makefile.am +++ b/src/tools/other/modis_regrid/Makefile.am @@ -33,10 +33,10 @@ modis_regrid_LDADD = -lvx_pxm \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/modis_regrid/Makefile.in b/src/tools/other/modis_regrid/Makefile.in index c729a8f360..42992d286c 100644 --- a/src/tools/other/modis_regrid/Makefile.in +++ b/src/tools/other/modis_regrid/Makefile.in @@ -110,7 +110,9 @@ am_modis_regrid_OBJECTS = modis_regrid-modis_regrid.$(OBJEXT) \ modis_regrid_OBJECTS = $(am_modis_regrid_OBJECTS) am__DEPENDENCIES_1 = modis_regrid_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) modis_regrid_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(modis_regrid_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -208,7 +210,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -271,12 +274,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -357,10 +362,10 @@ modis_regrid_LDADD = -lvx_pxm \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/other/pb2nc/Makefile.am b/src/tools/other/pb2nc/Makefile.am index aa48399345..8067c0689b 100644 --- a/src/tools/other/pb2nc/Makefile.am +++ b/src/tools/other/pb2nc/Makefile.am @@ -38,11 +38,11 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_nc_util \ @@ -59,7 +59,7 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \ $(FLIBS) diff --git a/src/tools/other/pb2nc/Makefile.in b/src/tools/other/pb2nc/Makefile.in index 74683d687e..850d313279 100644 --- a/src/tools/other/pb2nc/Makefile.in +++ b/src/tools/other/pb2nc/Makefile.in @@ -109,6 +109,8 @@ pb2nc_OBJECTS = $(am_pb2nc_OBJECTS) am__DEPENDENCIES_1 = @BUFRLIB_NAME_SET_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) pb2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) pb2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(pb2nc_LDFLAGS) \ @@ -228,7 +230,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -291,12 +294,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -377,11 +382,11 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_nc_util \ @@ -398,7 +403,7 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \ $(FLIBS) diff --git a/src/tools/other/plot_data_plane/Makefile.am b/src/tools/other/plot_data_plane/Makefile.am index 14316dc1a5..76d6262cd0 100644 --- a/src/tools/other/plot_data_plane/Makefile.am +++ b/src/tools/other/plot_data_plane/Makefile.am @@ -16,11 +16,11 @@ plot_data_plane_CPPFLAGS = ${MET_CPPFLAGS} plot_data_plane_LDFLAGS = ${MET_LDFLAGS} plot_data_plane_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/plot_data_plane/Makefile.in b/src/tools/other/plot_data_plane/Makefile.in index f017f64b3b..3944a095f2 100644 --- a/src/tools/other/plot_data_plane/Makefile.in +++ b/src/tools/other/plot_data_plane/Makefile.in @@ -106,7 +106,9 @@ am_plot_data_plane_OBJECTS = \ plot_data_plane_OBJECTS = $(am_plot_data_plane_OBJECTS) am__DEPENDENCIES_1 = plot_data_plane_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) plot_data_plane_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(plot_data_plane_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -199,7 +201,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -262,12 +265,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -330,11 +335,11 @@ plot_data_plane_CPPFLAGS = ${MET_CPPFLAGS} plot_data_plane_LDFLAGS = ${MET_LDFLAGS} plot_data_plane_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/plot_point_obs/Makefile.am b/src/tools/other/plot_point_obs/Makefile.am index e533198b86..fa00e0fb6a 100644 --- a/src/tools/other/plot_point_obs/Makefile.am +++ b/src/tools/other/plot_point_obs/Makefile.am @@ -18,11 +18,11 @@ plot_point_obs_LDFLAGS = ${MET_LDFLAGS} plot_point_obs_LDADD = -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_statistics \ @@ -46,7 +46,7 @@ plot_point_obs_LDADD = -lvx_statistics \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = plot_point_obs.h \ plot_point_obs_conf_info.h diff --git a/src/tools/other/plot_point_obs/Makefile.in b/src/tools/other/plot_point_obs/Makefile.in index af7851e794..18bf672fc4 100644 --- a/src/tools/other/plot_point_obs/Makefile.in +++ b/src/tools/other/plot_point_obs/Makefile.in @@ -106,6 +106,8 @@ am_plot_point_obs_OBJECTS = plot_point_obs-plot_point_obs.$(OBJEXT) \ plot_point_obs_OBJECTS = $(am_plot_point_obs_OBJECTS) am__DEPENDENCIES_1 = plot_point_obs_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) plot_point_obs_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ @@ -201,7 +203,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -264,12 +267,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -335,11 +340,11 @@ plot_point_obs_LDFLAGS = ${MET_LDFLAGS} plot_point_obs_LDADD = -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_statistics \ @@ -363,7 +368,7 @@ plot_point_obs_LDADD = -lvx_statistics \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = plot_point_obs.h \ diff --git a/src/tools/other/point2grid/Makefile.am b/src/tools/other/point2grid/Makefile.am index e9ed70c742..8af72bc09f 100644 --- a/src/tools/other/point2grid/Makefile.am +++ b/src/tools/other/point2grid/Makefile.am @@ -18,11 +18,11 @@ point2grid_LDFLAGS = ${MET_LDFLAGS} point2grid_LDADD = -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_nc_obs \ @@ -38,5 +38,5 @@ point2grid_LDADD = -lvx_statistics \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/src/tools/other/point2grid/Makefile.in b/src/tools/other/point2grid/Makefile.in index e907adfeed..cce0a68a8c 100644 --- a/src/tools/other/point2grid/Makefile.in +++ b/src/tools/other/point2grid/Makefile.in @@ -106,6 +106,8 @@ am_point2grid_OBJECTS = point2grid-point2grid.$(OBJEXT) \ point2grid_OBJECTS = $(am_point2grid_OBJECTS) am__DEPENDENCIES_1 = point2grid_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) point2grid_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(point2grid_LDFLAGS) $(LDFLAGS) -o $@ @@ -212,7 +214,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -275,12 +278,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -346,11 +351,11 @@ point2grid_LDFLAGS = ${MET_LDFLAGS} point2grid_LDADD = -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ - $(PYTHON_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_nc_obs \ @@ -366,7 +371,7 @@ point2grid_LDADD = -lvx_statistics \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/src/tools/other/regrid_data_plane/Makefile.am b/src/tools/other/regrid_data_plane/Makefile.am index 8c7a4692dd..758dc5590a 100644 --- a/src/tools/other/regrid_data_plane/Makefile.am +++ b/src/tools/other/regrid_data_plane/Makefile.am @@ -17,11 +17,11 @@ regrid_data_plane_LDFLAGS = ${MET_LDFLAGS} regrid_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/regrid_data_plane/Makefile.in b/src/tools/other/regrid_data_plane/Makefile.in index ac75642ec6..7dbee11745 100644 --- a/src/tools/other/regrid_data_plane/Makefile.in +++ b/src/tools/other/regrid_data_plane/Makefile.in @@ -106,7 +106,9 @@ am_regrid_data_plane_OBJECTS = \ regrid_data_plane_OBJECTS = $(am_regrid_data_plane_OBJECTS) am__DEPENDENCIES_1 = regrid_data_plane_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) regrid_data_plane_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(regrid_data_plane_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -200,7 +202,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -263,12 +266,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -332,11 +337,11 @@ regrid_data_plane_LDFLAGS = ${MET_LDFLAGS} regrid_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/shift_data_plane/Makefile.am b/src/tools/other/shift_data_plane/Makefile.am index 498c5365bc..2ff6d0ae98 100644 --- a/src/tools/other/shift_data_plane/Makefile.am +++ b/src/tools/other/shift_data_plane/Makefile.am @@ -17,11 +17,11 @@ shift_data_plane_LDFLAGS = ${MET_LDFLAGS} shift_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/shift_data_plane/Makefile.in b/src/tools/other/shift_data_plane/Makefile.in index 3a441c1557..bc03b74407 100644 --- a/src/tools/other/shift_data_plane/Makefile.in +++ b/src/tools/other/shift_data_plane/Makefile.in @@ -106,7 +106,9 @@ am_shift_data_plane_OBJECTS = \ shift_data_plane_OBJECTS = $(am_shift_data_plane_OBJECTS) am__DEPENDENCIES_1 = shift_data_plane_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) shift_data_plane_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(shift_data_plane_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -200,7 +202,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -263,12 +266,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -332,11 +337,11 @@ shift_data_plane_LDFLAGS = ${MET_LDFLAGS} shift_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ diff --git a/src/tools/other/wwmca_tool/Makefile.am b/src/tools/other/wwmca_tool/Makefile.am index 53f2b0a508..b7a3bd7694 100644 --- a/src/tools/other/wwmca_tool/Makefile.am +++ b/src/tools/other/wwmca_tool/Makefile.am @@ -40,11 +40,11 @@ wwmca_regrid_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -87,11 +87,11 @@ wwmca_plot_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/src/tools/other/wwmca_tool/Makefile.in b/src/tools/other/wwmca_tool/Makefile.in index f557c2a805..00733dddfe 100644 --- a/src/tools/other/wwmca_tool/Makefile.in +++ b/src/tools/other/wwmca_tool/Makefile.in @@ -114,7 +114,8 @@ am_wwmca_plot_OBJECTS = wwmca_plot-gridhemisphere_to_string.$(OBJEXT) \ wwmca_plot_OBJECTS = $(am_wwmca_plot_OBJECTS) am__DEPENDENCIES_1 = wwmca_plot_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) wwmca_plot_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(wwmca_plot_LDFLAGS) $(LDFLAGS) -o $@ am_wwmca_regrid_OBJECTS = \ @@ -132,7 +133,9 @@ am_wwmca_regrid_OBJECTS = \ wwmca_regrid-nc_output.$(OBJEXT) wwmca_regrid_OBJECTS = $(am_wwmca_regrid_OBJECTS) wwmca_regrid_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) wwmca_regrid_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(wwmca_regrid_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -259,7 +262,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -322,12 +326,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -413,11 +419,11 @@ wwmca_regrid_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -461,11 +467,11 @@ wwmca_plot_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ diff --git a/src/tools/tc_utils/Makefile.in b/src/tools/tc_utils/Makefile.in index 81d0bf3db7..7c74bba2fa 100644 --- a/src/tools/tc_utils/Makefile.in +++ b/src/tools/tc_utils/Makefile.in @@ -209,7 +209,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -272,12 +273,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.am b/src/tools/tc_utils/rmw_analysis/Makefile.am index fba765027a..1174b06f89 100644 --- a/src/tools/tc_utils/rmw_analysis/Makefile.am +++ b/src/tools/tc_utils/rmw_analysis/Makefile.am @@ -22,11 +22,11 @@ rmw_analysis_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.in b/src/tools/tc_utils/rmw_analysis/Makefile.in index 224d6c8f68..0ea6f5bb2b 100644 --- a/src/tools/tc_utils/rmw_analysis/Makefile.in +++ b/src/tools/tc_utils/rmw_analysis/Makefile.in @@ -107,7 +107,8 @@ rmw_analysis_OBJECTS = $(am_rmw_analysis_OBJECTS) am__DEPENDENCIES_1 = rmw_analysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) rmw_analysis_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(rmw_analysis_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -201,7 +202,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -264,12 +266,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -339,11 +343,11 @@ rmw_analysis_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_diag/Makefile.am b/src/tools/tc_utils/tc_diag/Makefile.am index 51132dd579..413e5ee766 100644 --- a/src/tools/tc_utils/tc_diag/Makefile.am +++ b/src/tools/tc_utils/tc_diag/Makefile.am @@ -23,11 +23,11 @@ tc_diag_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_diag/Makefile.in b/src/tools/tc_utils/tc_diag/Makefile.in index 276f8f1fe8..7d58f52e33 100644 --- a/src/tools/tc_utils/tc_diag/Makefile.in +++ b/src/tools/tc_utils/tc_diag/Makefile.in @@ -107,7 +107,9 @@ am_tc_diag_OBJECTS = tc_diag-tc_diag.$(OBJEXT) \ tc_diag_OBJECTS = $(am_tc_diag_OBJECTS) am__DEPENDENCIES_1 = tc_diag_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) tc_diag_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(tc_diag_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -202,7 +204,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -265,12 +268,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -341,11 +346,11 @@ tc_diag_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_dland/Makefile.am b/src/tools/tc_utils/tc_dland/Makefile.am index 675c0c1952..b3edfa55d5 100644 --- a/src/tools/tc_utils/tc_dland/Makefile.am +++ b/src/tools/tc_utils/tc_dland/Makefile.am @@ -16,7 +16,7 @@ tc_dland_SOURCES = tc_dland.cc \ tc_dland_CPPFLAGS = ${MET_CPPFLAGS} tc_dland_LDFLAGS = ${MET_LDFLAGS} tc_dland_LDADD = -lvx_tc_util \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_nc_util \ -lvx_grid \ -lvx_geodesy \ diff --git a/src/tools/tc_utils/tc_dland/Makefile.in b/src/tools/tc_utils/tc_dland/Makefile.in index 73a5c3d484..6b8655078a 100644 --- a/src/tools/tc_utils/tc_dland/Makefile.in +++ b/src/tools/tc_utils/tc_dland/Makefile.in @@ -105,7 +105,8 @@ am_tc_dland_OBJECTS = tc_dland-tc_dland.$(OBJEXT) \ tc_dland-tc_poly.$(OBJEXT) tc_dland_OBJECTS = $(am_tc_dland_OBJECTS) am__DEPENDENCIES_1 = -tc_dland_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +tc_dland_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) tc_dland_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(tc_dland_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -211,7 +212,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -274,12 +276,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -343,7 +347,7 @@ tc_dland_SOURCES = tc_dland.cc \ tc_dland_CPPFLAGS = ${MET_CPPFLAGS} tc_dland_LDFLAGS = ${MET_LDFLAGS} tc_dland_LDADD = -lvx_tc_util \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_nc_util \ -lvx_grid \ -lvx_geodesy \ diff --git a/src/tools/tc_utils/tc_gen/Makefile.am b/src/tools/tc_utils/tc_gen/Makefile.am index 92e0f521d2..58fa294f4c 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.am +++ b/src/tools/tc_utils/tc_gen/Makefile.am @@ -23,11 +23,11 @@ tc_gen_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_gis \ -lvx_data2d \ diff --git a/src/tools/tc_utils/tc_gen/Makefile.in b/src/tools/tc_utils/tc_gen/Makefile.in index c959b67d9f..b7018796bc 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.in +++ b/src/tools/tc_utils/tc_gen/Makefile.in @@ -106,7 +106,9 @@ am_tc_gen_OBJECTS = tc_gen-tc_gen.$(OBJEXT) \ tc_gen_OBJECTS = $(am_tc_gen_OBJECTS) am__DEPENDENCIES_1 = tc_gen_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) tc_gen_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(tc_gen_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -200,7 +202,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -263,12 +266,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -339,11 +344,11 @@ tc_gen_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_gis \ -lvx_data2d \ diff --git a/src/tools/tc_utils/tc_pairs/Makefile.am b/src/tools/tc_utils/tc_pairs/Makefile.am index 37ff3b7616..97807a6314 100644 --- a/src/tools/tc_utils/tc_pairs/Makefile.am +++ b/src/tools/tc_utils/tc_pairs/Makefile.am @@ -25,11 +25,11 @@ tc_pairs_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_pairs/Makefile.in b/src/tools/tc_utils/tc_pairs/Makefile.in index d927832f62..ce571a3584 100644 --- a/src/tools/tc_utils/tc_pairs/Makefile.in +++ b/src/tools/tc_utils/tc_pairs/Makefile.in @@ -106,7 +106,9 @@ am_tc_pairs_OBJECTS = tc_pairs-tc_pairs.$(OBJEXT) acerr.$(OBJEXT) \ tc_pairs_OBJECTS = $(am_tc_pairs_OBJECTS) am__DEPENDENCIES_1 = tc_pairs_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) tc_pairs_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(tc_pairs_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -224,7 +226,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -287,12 +290,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -365,11 +370,11 @@ tc_pairs_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_rmw/Makefile.am b/src/tools/tc_utils/tc_rmw/Makefile.am index b9b562f747..aef7f506d6 100644 --- a/src/tools/tc_utils/tc_rmw/Makefile.am +++ b/src/tools/tc_utils/tc_rmw/Makefile.am @@ -23,11 +23,11 @@ tc_rmw_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_rmw/Makefile.in b/src/tools/tc_utils/tc_rmw/Makefile.in index a5a09172d2..4c0fb15140 100644 --- a/src/tools/tc_utils/tc_rmw/Makefile.in +++ b/src/tools/tc_utils/tc_rmw/Makefile.in @@ -107,7 +107,9 @@ am_tc_rmw_OBJECTS = tc_rmw-tc_rmw.$(OBJEXT) \ tc_rmw_OBJECTS = $(am_tc_rmw_OBJECTS) am__DEPENDENCIES_1 = tc_rmw_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) tc_rmw_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(tc_rmw_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -202,7 +204,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -265,12 +268,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -341,11 +346,11 @@ tc_rmw_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ diff --git a/src/tools/tc_utils/tc_stat/Makefile.am b/src/tools/tc_utils/tc_stat/Makefile.am index 8823604e0f..d40a6cfdee 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.am +++ b/src/tools/tc_utils/tc_stat/Makefile.am @@ -25,11 +25,11 @@ tc_stat_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ diff --git a/src/tools/tc_utils/tc_stat/Makefile.in b/src/tools/tc_utils/tc_stat/Makefile.in index 73c33fe6b4..3e406c4a19 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.in +++ b/src/tools/tc_utils/tc_stat/Makefile.in @@ -107,7 +107,8 @@ am_tc_stat_OBJECTS = tc_stat-tc_stat.$(OBJEXT) \ tc_stat_OBJECTS = $(am_tc_stat_OBJECTS) am__DEPENDENCIES_1 = tc_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) tc_stat_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(tc_stat_LDFLAGS) \ $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -203,7 +204,8 @@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ -GRIB2_LIBS = @GRIB2_LIBS@ +GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ +GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -266,12 +268,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_DEP_LIBS = @PYTHON_DEP_LIBS@ +PYTHON_MET_LIBS = @PYTHON_MET_LIBS@ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ -UGRID_LIBS = @UGRID_LIBS@ +UGRID_DEP_LIBS = @UGRID_DEP_LIBS@ +UGRID_MET_LIBS = @UGRID_MET_LIBS@ VERSION = @VERSION@ YACC = @YACC@ YFLAGS = @YFLAGS@ @@ -344,11 +348,11 @@ tc_stat_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_LIBS) \ + -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_LIBS) \ + $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_LIBS) \ + $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ From 75cf04aa619c7cc15bbe12a94102d26535b21abe Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Wed, 15 Nov 2023 14:33:40 -0700 Subject: [PATCH 103/109] Per #2231, more changes to library linking in Makefile to get a successful compilation using the dtcenter/met-base-unit-test:v3.1 image. --- .../test_util/libcode/vx_data2d/Makefile.am | 3 ++- .../test_util/libcode/vx_data2d/Makefile.in | 3 ++- .../libcode/vx_data2d_factory/Makefile.am | 8 ++++--- .../libcode/vx_data2d_factory/Makefile.in | 8 ++++--- .../libcode/vx_data2d_grib/Makefile.am | 3 ++- .../libcode/vx_data2d_grib/Makefile.in | 3 ++- .../libcode/vx_data2d_nc_met/Makefile.am | 3 ++- .../libcode/vx_data2d_nc_met/Makefile.in | 3 ++- .../libcode/vx_data2d_nccf/Makefile.am | 3 ++- .../libcode/vx_data2d_nccf/Makefile.in | 3 ++- .../test_util/libcode/vx_grid/Makefile.am | 3 ++- .../test_util/libcode/vx_grid/Makefile.in | 3 ++- .../tools/other/mode_time_domain/Makefile.am | 10 ++++---- .../tools/other/mode_time_domain/Makefile.in | 10 ++++---- src/tools/core/ensemble_stat/Makefile.am | 9 +++---- src/tools/core/ensemble_stat/Makefile.in | 10 ++++---- src/tools/core/grid_stat/Makefile.am | 8 ++++--- src/tools/core/grid_stat/Makefile.in | 8 ++++--- src/tools/core/mode/Makefile.am | 8 ++++--- src/tools/core/mode/Makefile.in | 8 ++++--- src/tools/core/mode_analysis/Makefile.am | 11 +++++---- src/tools/core/mode_analysis/Makefile.in | 12 +++++----- src/tools/core/pcp_combine/Makefile.am | 8 ++++--- src/tools/core/pcp_combine/Makefile.in | 8 ++++--- src/tools/core/point_stat/Makefile.am | 9 +++---- src/tools/core/point_stat/Makefile.in | 10 ++++---- src/tools/core/series_analysis/Makefile.am | 8 ++++--- src/tools/core/series_analysis/Makefile.in | 8 ++++--- src/tools/core/stat_analysis/Makefile.am | 8 ++++--- src/tools/core/stat_analysis/Makefile.in | 8 ++++--- src/tools/core/wavelet_stat/Makefile.am | 8 ++++--- src/tools/core/wavelet_stat/Makefile.in | 8 ++++--- src/tools/dev_utils/Makefile.am | 8 ++++--- src/tools/dev_utils/Makefile.in | 8 ++++--- src/tools/other/ascii2nc/Makefile.am | 9 +++---- src/tools/other/ascii2nc/Makefile.in | 10 ++++---- src/tools/other/gen_ens_prod/Makefile.am | 9 +++---- src/tools/other/gen_ens_prod/Makefile.in | 10 ++++---- src/tools/other/gen_vx_mask/Makefile.am | 10 ++++---- src/tools/other/gen_vx_mask/Makefile.in | 10 ++++---- src/tools/other/grid_diag/Makefile.am | 8 ++++--- src/tools/other/grid_diag/Makefile.in | 8 ++++--- src/tools/other/gsi_tools/Makefile.am | 22 +++++++++-------- src/tools/other/gsi_tools/Makefile.in | 24 +++++++++---------- src/tools/other/ioda2nc/Makefile.am | 9 +++---- src/tools/other/ioda2nc/Makefile.in | 10 ++++---- src/tools/other/lidar2nc/Makefile.am | 7 +++--- src/tools/other/lidar2nc/Makefile.in | 9 +++---- src/tools/other/madis2nc/Makefile.am | 9 +++---- src/tools/other/madis2nc/Makefile.in | 10 ++++---- src/tools/other/mode_graphics/Makefile.am | 8 ++++--- src/tools/other/mode_graphics/Makefile.in | 8 ++++--- src/tools/other/mode_time_domain/Makefile.am | 8 ++++--- src/tools/other/mode_time_domain/Makefile.in | 8 ++++--- src/tools/other/modis_regrid/Makefile.am | 9 ++++--- src/tools/other/modis_regrid/Makefile.in | 9 ++++--- src/tools/other/pb2nc/Makefile.am | 9 +++---- src/tools/other/pb2nc/Makefile.in | 10 ++++---- src/tools/other/plot_data_plane/Makefile.am | 8 ++++--- src/tools/other/plot_data_plane/Makefile.in | 8 ++++--- src/tools/other/plot_point_obs/Makefile.am | 9 +++---- src/tools/other/plot_point_obs/Makefile.in | 10 ++++---- src/tools/other/point2grid/Makefile.am | 9 +++---- src/tools/other/point2grid/Makefile.in | 10 ++++---- src/tools/other/regrid_data_plane/Makefile.am | 8 ++++--- src/tools/other/regrid_data_plane/Makefile.in | 8 ++++--- src/tools/other/shift_data_plane/Makefile.am | 8 ++++--- src/tools/other/shift_data_plane/Makefile.in | 8 ++++--- src/tools/other/wwmca_tool/Makefile.am | 16 ++++++++----- src/tools/other/wwmca_tool/Makefile.in | 16 ++++++++----- src/tools/tc_utils/rmw_analysis/Makefile.am | 8 ++++--- src/tools/tc_utils/rmw_analysis/Makefile.in | 8 ++++--- src/tools/tc_utils/tc_diag/Makefile.am | 8 ++++--- src/tools/tc_utils/tc_diag/Makefile.in | 8 ++++--- src/tools/tc_utils/tc_dland/Makefile.am | 3 ++- src/tools/tc_utils/tc_dland/Makefile.in | 3 ++- src/tools/tc_utils/tc_gen/Makefile.am | 8 ++++--- src/tools/tc_utils/tc_gen/Makefile.in | 8 ++++--- src/tools/tc_utils/tc_pairs/Makefile.am | 8 ++++--- src/tools/tc_utils/tc_pairs/Makefile.in | 8 ++++--- src/tools/tc_utils/tc_rmw/Makefile.am | 8 ++++--- src/tools/tc_utils/tc_rmw/Makefile.in | 8 ++++--- src/tools/tc_utils/tc_stat/Makefile.am | 8 ++++--- src/tools/tc_utils/tc_stat/Makefile.in | 8 ++++--- 84 files changed, 415 insertions(+), 287 deletions(-) diff --git a/internal/test_util/libcode/vx_data2d/Makefile.am b/internal/test_util/libcode/vx_data2d/Makefile.am index 747a22c3f1..1759c4087c 100644 --- a/internal/test_util/libcode/vx_data2d/Makefile.am +++ b/internal/test_util/libcode/vx_data2d/Makefile.am @@ -34,7 +34,7 @@ dump_default_table_LDFLAGS = -L. ${MET_LDFLAGS} dump_default_table_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_log \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ -lvx_data2d \ -lvx_grid \ -lvx_geodesy \ @@ -42,4 +42,5 @@ dump_default_table_LDADD = -lvx_config \ -lvx_cal \ -lvx_math \ -lvx_log \ + $(UGRID_DEP_LIBS) \ -lproj -lgsl -lgslcblas diff --git a/internal/test_util/libcode/vx_data2d/Makefile.in b/internal/test_util/libcode/vx_data2d/Makefile.in index 5117e13a0a..f659f7c81a 100644 --- a/internal/test_util/libcode/vx_data2d/Makefile.in +++ b/internal/test_util/libcode/vx_data2d/Makefile.in @@ -357,7 +357,7 @@ dump_default_table_LDFLAGS = -L. ${MET_LDFLAGS} dump_default_table_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_log \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ -lvx_data2d \ -lvx_grid \ -lvx_geodesy \ @@ -365,6 +365,7 @@ dump_default_table_LDADD = -lvx_config \ -lvx_cal \ -lvx_math \ -lvx_log \ + $(UGRID_DEP_LIBS) \ -lproj -lgsl -lgslcblas all: all-am diff --git a/internal/test_util/libcode/vx_data2d_factory/Makefile.am b/internal/test_util/libcode/vx_data2d_factory/Makefile.am index fe38d4d23f..77bd62fff1 100644 --- a/internal/test_util/libcode/vx_data2d_factory/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_factory/Makefile.am @@ -32,11 +32,12 @@ test_factory_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -51,4 +52,5 @@ test_factory_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/internal/test_util/libcode/vx_data2d_factory/Makefile.in b/internal/test_util/libcode/vx_data2d_factory/Makefile.in index 331d687f93..7964d3fd22 100644 --- a/internal/test_util/libcode/vx_data2d_factory/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_factory/Makefile.in @@ -353,11 +353,12 @@ test_factory_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -372,6 +373,7 @@ test_factory_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/internal/test_util/libcode/vx_data2d_grib/Makefile.am b/internal/test_util/libcode/vx_data2d_grib/Makefile.am index 9244018e37..4bdf460e12 100644 --- a/internal/test_util/libcode/vx_data2d_grib/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_grib/Makefile.am @@ -16,7 +16,7 @@ test_read_grib1_SOURCES = test_read_grib1.cc test_read_grib1_CPPFLAGS = ${MET_CPPFLAGS} test_read_grib1_LDFLAGS = -L. ${MET_LDFLAGS} test_read_grib1_LDADD = -lvx_data2d_grib \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ -lvx_data2d \ -lvx_grid \ -lvx_geodesy \ @@ -28,4 +28,5 @@ test_read_grib1_LDADD = -lvx_data2d_grib \ -lvx_color \ -lvx_cal \ -lvx_log \ + $(UGRID_DEP_LIBS) \ -lproj -lgsl -lgslcblas diff --git a/internal/test_util/libcode/vx_data2d_grib/Makefile.in b/internal/test_util/libcode/vx_data2d_grib/Makefile.in index 3f87570294..5591f6439b 100644 --- a/internal/test_util/libcode/vx_data2d_grib/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_grib/Makefile.in @@ -331,7 +331,7 @@ test_read_grib1_SOURCES = test_read_grib1.cc test_read_grib1_CPPFLAGS = ${MET_CPPFLAGS} test_read_grib1_LDFLAGS = -L. ${MET_LDFLAGS} test_read_grib1_LDADD = -lvx_data2d_grib \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ -lvx_data2d \ -lvx_grid \ -lvx_geodesy \ @@ -343,6 +343,7 @@ test_read_grib1_LDADD = -lvx_data2d_grib \ -lvx_color \ -lvx_cal \ -lvx_log \ + $(UGRID_DEP_LIBS) \ -lproj -lgsl -lgslcblas all: all-am diff --git a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am index 0edfede083..e0100f5fdc 100644 --- a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.am @@ -16,7 +16,7 @@ test_read_nc_met_SOURCES = test_read_nc_met.cc test_read_nc_met_CPPFLAGS = ${MET_CPPFLAGS} test_read_nc_met_LDFLAGS = -L. ${MET_LDFLAGS} test_read_nc_met_LDADD = -lvx_data2d_nc_met \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ -lvx_nc_util \ -lvx_data2d \ -lvx_grid \ @@ -29,4 +29,5 @@ test_read_nc_met_LDADD = -lvx_data2d_nc_met \ -lvx_color \ -lvx_cal \ -lvx_log \ + $(UGRID_DEP_LIBS) \ -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in index 501c9356bc..25fc3da12e 100644 --- a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in @@ -332,7 +332,7 @@ test_read_nc_met_SOURCES = test_read_nc_met.cc test_read_nc_met_CPPFLAGS = ${MET_CPPFLAGS} test_read_nc_met_LDFLAGS = -L. ${MET_LDFLAGS} test_read_nc_met_LDADD = -lvx_data2d_nc_met \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ -lvx_nc_util \ -lvx_data2d \ -lvx_grid \ @@ -345,6 +345,7 @@ test_read_nc_met_LDADD = -lvx_data2d_nc_met \ -lvx_color \ -lvx_cal \ -lvx_log \ + $(UGRID_DEP_LIBS) \ -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.am b/internal/test_util/libcode/vx_data2d_nccf/Makefile.am index 59146cd257..1c9bbbe8e3 100644 --- a/internal/test_util/libcode/vx_data2d_nccf/Makefile.am +++ b/internal/test_util/libcode/vx_data2d_nccf/Makefile.am @@ -16,7 +16,7 @@ test_read_nccf_SOURCES = test_read_nccf.cc test_read_nccf_CPPFLAGS = ${MET_CPPFLAGS} test_read_nccf_LDFLAGS = -L. ${MET_LDFLAGS} test_read_nccf_LDADD = -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ -lvx_nc_util \ -lvx_data2d \ -lvx_grid \ @@ -29,4 +29,5 @@ test_read_nccf_LDADD = -lvx_data2d_nccf \ -lvx_color \ -lvx_cal \ -lvx_log \ + $(UGRID_DEP_LIBS) \ -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in index 2e52c4b773..26689f2e99 100644 --- a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in @@ -330,7 +330,7 @@ test_read_nccf_SOURCES = test_read_nccf.cc test_read_nccf_CPPFLAGS = ${MET_CPPFLAGS} test_read_nccf_LDFLAGS = -L. ${MET_LDFLAGS} test_read_nccf_LDADD = -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ -lvx_nc_util \ -lvx_data2d \ -lvx_grid \ @@ -343,6 +343,7 @@ test_read_nccf_LDADD = -lvx_data2d_nccf \ -lvx_color \ -lvx_cal \ -lvx_log \ + $(UGRID_DEP_LIBS) \ -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/internal/test_util/libcode/vx_grid/Makefile.am b/internal/test_util/libcode/vx_grid/Makefile.am index e310be9187..a36bcc50e0 100644 --- a/internal/test_util/libcode/vx_grid/Makefile.am +++ b/internal/test_util/libcode/vx_grid/Makefile.am @@ -16,7 +16,7 @@ test_grid_area_SOURCES = test_grid_area.cc test_grid_area_CPPFLAGS = ${MET_CPPFLAGS} test_grid_area_LDFLAGS = -L. ${MET_LDFLAGS} test_grid_area_LDADD = \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ -lvx_grid \ -lvx_geodesy \ -lvx_nav \ @@ -25,4 +25,5 @@ test_grid_area_LDADD = \ -lvx_math \ -lvx_cal \ -lvx_log \ + $(UGRID_DEP_LIBS) \ -lz -lm -lproj diff --git a/internal/test_util/libcode/vx_grid/Makefile.in b/internal/test_util/libcode/vx_grid/Makefile.in index 0719b2fe92..05203d024a 100644 --- a/internal/test_util/libcode/vx_grid/Makefile.in +++ b/internal/test_util/libcode/vx_grid/Makefile.in @@ -330,7 +330,7 @@ test_grid_area_SOURCES = test_grid_area.cc test_grid_area_CPPFLAGS = ${MET_CPPFLAGS} test_grid_area_LDFLAGS = -L. ${MET_LDFLAGS} test_grid_area_LDADD = \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ -lvx_grid \ -lvx_geodesy \ -lvx_nav \ @@ -339,6 +339,7 @@ test_grid_area_LDADD = \ -lvx_math \ -lvx_cal \ -lvx_log \ + $(UGRID_DEP_LIBS) \ -lz -lm -lproj all: all-am diff --git a/internal/test_util/tools/other/mode_time_domain/Makefile.am b/internal/test_util/tools/other/mode_time_domain/Makefile.am index 417b18e870..eb52695969 100644 --- a/internal/test_util/tools/other/mode_time_domain/Makefile.am +++ b/internal/test_util/tools/other/mode_time_domain/Makefile.am @@ -53,12 +53,13 @@ test_velocity_LDADD = \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ - -lvx_statistics \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ + -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ @@ -72,5 +73,6 @@ test_velocity_LDADD = \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz diff --git a/internal/test_util/tools/other/mode_time_domain/Makefile.in b/internal/test_util/tools/other/mode_time_domain/Makefile.in index 0af33ce21d..265f29603c 100644 --- a/internal/test_util/tools/other/mode_time_domain/Makefile.in +++ b/internal/test_util/tools/other/mode_time_domain/Makefile.in @@ -392,12 +392,13 @@ test_velocity_LDADD = \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ - -lvx_statistics \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ + -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ @@ -411,6 +412,7 @@ test_velocity_LDADD = \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz all: all-am diff --git a/src/tools/core/ensemble_stat/Makefile.am b/src/tools/core/ensemble_stat/Makefile.am index e43f8c4498..5d87a3aa4c 100644 --- a/src/tools/core/ensemble_stat/Makefile.am +++ b/src/tools/core/ensemble_stat/Makefile.am @@ -22,11 +22,12 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_seeps \ @@ -42,7 +43,7 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = ensemble_stat.h \ diff --git a/src/tools/core/ensemble_stat/Makefile.in b/src/tools/core/ensemble_stat/Makefile.in index 8da27fb9e6..d2c8c0d798 100644 --- a/src/tools/core/ensemble_stat/Makefile.in +++ b/src/tools/core/ensemble_stat/Makefile.in @@ -106,7 +106,6 @@ am_ensemble_stat_OBJECTS = ensemble_stat-ensemble_stat.$(OBJEXT) \ ensemble_stat_OBJECTS = $(am_ensemble_stat_OBJECTS) am__DEPENDENCIES_1 = ensemble_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -344,11 +343,12 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_seeps \ @@ -364,7 +364,7 @@ ensemble_stat_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = ensemble_stat.h \ diff --git a/src/tools/core/grid_stat/Makefile.am b/src/tools/core/grid_stat/Makefile.am index 72c5fd757b..4df815bed4 100644 --- a/src/tools/core/grid_stat/Makefile.am +++ b/src/tools/core/grid_stat/Makefile.am @@ -22,11 +22,12 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ @@ -42,6 +43,7 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = grid_stat.h \ diff --git a/src/tools/core/grid_stat/Makefile.in b/src/tools/core/grid_stat/Makefile.in index d665e98f51..2c8b909c39 100644 --- a/src/tools/core/grid_stat/Makefile.in +++ b/src/tools/core/grid_stat/Makefile.in @@ -342,11 +342,12 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ @@ -362,6 +363,7 @@ grid_stat_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = grid_stat.h \ diff --git a/src/tools/core/mode/Makefile.am b/src/tools/core/mode/Makefile.am index d56e531cc9..72a35a6175 100644 --- a/src/tools/core/mode/Makefile.am +++ b/src/tools/core/mode/Makefile.am @@ -41,11 +41,12 @@ mode_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ @@ -61,6 +62,7 @@ mode_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz EXTRA_DIST = mode_exec.h \ diff --git a/src/tools/core/mode/Makefile.in b/src/tools/core/mode/Makefile.in index 9c1f34be1e..249a93d1bb 100644 --- a/src/tools/core/mode/Makefile.in +++ b/src/tools/core/mode/Makefile.in @@ -379,11 +379,12 @@ mode_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ @@ -399,6 +400,7 @@ mode_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz EXTRA_DIST = mode_exec.h \ diff --git a/src/tools/core/mode_analysis/Makefile.am b/src/tools/core/mode_analysis/Makefile.am index bfb73b89f8..1bff9fadc7 100644 --- a/src/tools/core/mode_analysis/Makefile.am +++ b/src/tools/core/mode_analysis/Makefile.am @@ -22,15 +22,15 @@ mode_analysis_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ - -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ + -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ @@ -44,6 +44,7 @@ mode_analysis_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util EXTRA_DIST = config_to_att.h diff --git a/src/tools/core/mode_analysis/Makefile.in b/src/tools/core/mode_analysis/Makefile.in index 8040d5da85..ce4e7bc477 100644 --- a/src/tools/core/mode_analysis/Makefile.in +++ b/src/tools/core/mode_analysis/Makefile.in @@ -106,7 +106,6 @@ am_mode_analysis_OBJECTS = mode_analysis-mode_analysis.$(OBJEXT) \ mode_analysis_OBJECTS = $(am_mode_analysis_OBJECTS) am__DEPENDENCIES_1 = mode_analysis_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -344,15 +343,15 @@ mode_analysis_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ - -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ + -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ @@ -366,6 +365,7 @@ mode_analysis_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util EXTRA_DIST = config_to_att.h diff --git a/src/tools/core/pcp_combine/Makefile.am b/src/tools/core/pcp_combine/Makefile.am index 06867a5dd4..0206f497ca 100644 --- a/src/tools/core/pcp_combine/Makefile.am +++ b/src/tools/core/pcp_combine/Makefile.am @@ -16,11 +16,12 @@ pcp_combine_CPPFLAGS = ${MET_CPPFLAGS} pcp_combine_LDFLAGS = ${MET_LDFLAGS} pcp_combine_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -35,4 +36,5 @@ pcp_combine_LDADD = -lvx_data2d_factory \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/src/tools/core/pcp_combine/Makefile.in b/src/tools/core/pcp_combine/Makefile.in index 6c1cb2d5b5..751ecc5b8a 100644 --- a/src/tools/core/pcp_combine/Makefile.in +++ b/src/tools/core/pcp_combine/Makefile.in @@ -333,11 +333,12 @@ pcp_combine_CPPFLAGS = ${MET_CPPFLAGS} pcp_combine_LDFLAGS = ${MET_LDFLAGS} pcp_combine_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -352,6 +353,7 @@ pcp_combine_LDADD = -lvx_data2d_factory \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/src/tools/core/point_stat/Makefile.am b/src/tools/core/point_stat/Makefile.am index 58f9c65ca5..39b45fcb1b 100644 --- a/src/tools/core/point_stat/Makefile.am +++ b/src/tools/core/point_stat/Makefile.am @@ -21,11 +21,12 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_seeps \ @@ -42,7 +43,7 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = point_stat.h \ diff --git a/src/tools/core/point_stat/Makefile.in b/src/tools/core/point_stat/Makefile.in index 219ac780cd..ccaa3f8e36 100644 --- a/src/tools/core/point_stat/Makefile.in +++ b/src/tools/core/point_stat/Makefile.in @@ -106,7 +106,6 @@ am_point_stat_OBJECTS = point_stat-point_stat.$(OBJEXT) \ point_stat_OBJECTS = $(am_point_stat_OBJECTS) am__DEPENDENCIES_1 = point_stat_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) point_stat_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ @@ -342,11 +341,12 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_seeps \ @@ -363,7 +363,7 @@ point_stat_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = point_stat.h \ diff --git a/src/tools/core/series_analysis/Makefile.am b/src/tools/core/series_analysis/Makefile.am index 9d67af74b8..24f14c90e8 100644 --- a/src/tools/core/series_analysis/Makefile.am +++ b/src/tools/core/series_analysis/Makefile.am @@ -22,11 +22,12 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ @@ -42,6 +43,7 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = series_analysis.h \ diff --git a/src/tools/core/series_analysis/Makefile.in b/src/tools/core/series_analysis/Makefile.in index 1ec02b0ca0..9c68f8f191 100644 --- a/src/tools/core/series_analysis/Makefile.in +++ b/src/tools/core/series_analysis/Makefile.in @@ -344,11 +344,12 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ @@ -364,6 +365,7 @@ series_analysis_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = series_analysis.h \ diff --git a/src/tools/core/stat_analysis/Makefile.am b/src/tools/core/stat_analysis/Makefile.am index aa3561f2b5..f73b415ca2 100644 --- a/src/tools/core/stat_analysis/Makefile.am +++ b/src/tools/core/stat_analysis/Makefile.am @@ -25,11 +25,12 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_gsl_prob \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ @@ -48,6 +49,7 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_color \ -lvx_log \ -lvx_summary \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = stat_analysis.h \ diff --git a/src/tools/core/stat_analysis/Makefile.in b/src/tools/core/stat_analysis/Makefile.in index 230c331ac7..9d0b3c78ea 100644 --- a/src/tools/core/stat_analysis/Makefile.in +++ b/src/tools/core/stat_analysis/Makefile.in @@ -352,11 +352,12 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_gsl_prob \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ @@ -375,6 +376,7 @@ stat_analysis_LDADD = -lvx_stat_out \ -lvx_color \ -lvx_log \ -lvx_summary \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = stat_analysis.h \ diff --git a/src/tools/core/wavelet_stat/Makefile.am b/src/tools/core/wavelet_stat/Makefile.am index ca63fadb38..398ce49dcf 100644 --- a/src/tools/core/wavelet_stat/Makefile.am +++ b/src/tools/core/wavelet_stat/Makefile.am @@ -28,11 +28,12 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ @@ -48,6 +49,7 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = wavelet_stat.h \ diff --git a/src/tools/core/wavelet_stat/Makefile.in b/src/tools/core/wavelet_stat/Makefile.in index 568d90a937..bb37d28807 100644 --- a/src/tools/core/wavelet_stat/Makefile.in +++ b/src/tools/core/wavelet_stat/Makefile.in @@ -349,11 +349,12 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ @@ -369,6 +370,7 @@ wavelet_stat_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = wavelet_stat.h \ diff --git a/src/tools/dev_utils/Makefile.am b/src/tools/dev_utils/Makefile.am index f823bb0ab7..6aa78046a9 100644 --- a/src/tools/dev_utils/Makefile.am +++ b/src/tools/dev_utils/Makefile.am @@ -124,11 +124,12 @@ gen_climo_bin_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -143,6 +144,7 @@ gen_climo_bin_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas # Build chk4copyright when making a distribution so that we can diff --git a/src/tools/dev_utils/Makefile.in b/src/tools/dev_utils/Makefile.in index 8f692e2e4c..5ddb1db20b 100644 --- a/src/tools/dev_utils/Makefile.in +++ b/src/tools/dev_utils/Makefile.in @@ -578,11 +578,12 @@ gen_climo_bin_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -597,6 +598,7 @@ gen_climo_bin_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-recursive diff --git a/src/tools/other/ascii2nc/Makefile.am b/src/tools/other/ascii2nc/Makefile.am index 75eb86971d..ae5cf6402c 100644 --- a/src/tools/other/ascii2nc/Makefile.am +++ b/src/tools/other/ascii2nc/Makefile.am @@ -38,11 +38,12 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_nc_util \ @@ -59,7 +60,7 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_cal \ -lvx_math \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/src/tools/other/ascii2nc/Makefile.in b/src/tools/other/ascii2nc/Makefile.in index 73d21ea2b8..00f20b1511 100644 --- a/src/tools/other/ascii2nc/Makefile.in +++ b/src/tools/other/ascii2nc/Makefile.in @@ -128,7 +128,6 @@ am_ascii2nc_OBJECTS = ascii2nc-ascii2nc.$(OBJEXT) \ ascii2nc_OBJECTS = $(am_ascii2nc_OBJECTS) am__DEPENDENCIES_1 = ascii2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) ascii2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ @@ -398,11 +397,12 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_nc_util \ @@ -419,7 +419,7 @@ ascii2nc_LDADD = -lvx_stat_out \ -lvx_cal \ -lvx_math \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/src/tools/other/gen_ens_prod/Makefile.am b/src/tools/other/gen_ens_prod/Makefile.am index 464280a147..75ddde6311 100644 --- a/src/tools/other/gen_ens_prod/Makefile.am +++ b/src/tools/other/gen_ens_prod/Makefile.am @@ -22,11 +22,12 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_seeps \ @@ -42,7 +43,7 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = gen_ens_prod.h \ diff --git a/src/tools/other/gen_ens_prod/Makefile.in b/src/tools/other/gen_ens_prod/Makefile.in index cadbf4ce6e..285f993f59 100644 --- a/src/tools/other/gen_ens_prod/Makefile.in +++ b/src/tools/other/gen_ens_prod/Makefile.in @@ -106,7 +106,6 @@ am_gen_ens_prod_OBJECTS = gen_ens_prod-gen_ens_prod.$(OBJEXT) \ gen_ens_prod_OBJECTS = $(am_gen_ens_prod_OBJECTS) am__DEPENDENCIES_1 = gen_ens_prod_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -344,11 +343,12 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_seeps \ @@ -364,7 +364,7 @@ gen_ens_prod_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = gen_ens_prod.h \ diff --git a/src/tools/other/gen_vx_mask/Makefile.am b/src/tools/other/gen_vx_mask/Makefile.am index 818b9a2a55..c936c2f0f5 100644 --- a/src/tools/other/gen_vx_mask/Makefile.am +++ b/src/tools/other/gen_vx_mask/Makefile.am @@ -18,12 +18,13 @@ gen_vx_mask_LDFLAGS = ${MET_LDFLAGS} gen_vx_mask_LDADD = -lvx_shapedata \ -lvx_analysis_util \ -lvx_data2d_factory \ - -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_met \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + -lvx_data2d_nccf \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_gis \ -lvx_nc_util \ @@ -51,6 +52,7 @@ gen_vx_mask_LDADD = -lvx_shapedata \ -lvx_solar \ -lvx_cal \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = gen_vx_mask.h diff --git a/src/tools/other/gen_vx_mask/Makefile.in b/src/tools/other/gen_vx_mask/Makefile.in index 0ec4c42fa4..638ca649b7 100644 --- a/src/tools/other/gen_vx_mask/Makefile.in +++ b/src/tools/other/gen_vx_mask/Makefile.in @@ -334,12 +334,13 @@ gen_vx_mask_LDFLAGS = ${MET_LDFLAGS} gen_vx_mask_LDADD = -lvx_shapedata \ -lvx_analysis_util \ -lvx_data2d_factory \ - -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ -lvx_data2d_nc_met \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + -lvx_data2d_nccf \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_gis \ -lvx_nc_util \ @@ -367,6 +368,7 @@ gen_vx_mask_LDADD = -lvx_shapedata \ -lvx_solar \ -lvx_cal \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = gen_vx_mask.h diff --git a/src/tools/other/grid_diag/Makefile.am b/src/tools/other/grid_diag/Makefile.am index 39cc66e20a..8c55950475 100644 --- a/src/tools/other/grid_diag/Makefile.am +++ b/src/tools/other/grid_diag/Makefile.am @@ -22,11 +22,12 @@ grid_diag_LDADD = -lvx_stat_out \ -lvx_series_data \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -41,6 +42,7 @@ grid_diag_LDADD = -lvx_stat_out \ -lvx_color \ -lvx_log \ -lvx_gsl_prob \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = grid_diag.h \ diff --git a/src/tools/other/grid_diag/Makefile.in b/src/tools/other/grid_diag/Makefile.in index 3e0f9a8e1c..765eb7ce9c 100644 --- a/src/tools/other/grid_diag/Makefile.in +++ b/src/tools/other/grid_diag/Makefile.in @@ -342,11 +342,12 @@ grid_diag_LDADD = -lvx_stat_out \ -lvx_series_data \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -361,6 +362,7 @@ grid_diag_LDADD = -lvx_stat_out \ -lvx_color \ -lvx_log \ -lvx_gsl_prob \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = grid_diag.h \ diff --git a/src/tools/other/gsi_tools/Makefile.am b/src/tools/other/gsi_tools/Makefile.am index 0240814df5..54cf2cb4da 100644 --- a/src/tools/other/gsi_tools/Makefile.am +++ b/src/tools/other/gsi_tools/Makefile.am @@ -37,15 +37,15 @@ gsid2mpr_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ - -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ + -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ -lvx_nc_util \ @@ -61,6 +61,7 @@ gsid2mpr_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util gsidens2orank_SOURCES = gsidens2orank.h \ @@ -87,15 +88,15 @@ gsidens2orank_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ - -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ + -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ -lvx_nc_util \ @@ -111,5 +112,6 @@ gsidens2orank_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util diff --git a/src/tools/other/gsi_tools/Makefile.in b/src/tools/other/gsi_tools/Makefile.in index 468aab31bc..37a6a37ebf 100644 --- a/src/tools/other/gsi_tools/Makefile.in +++ b/src/tools/other/gsi_tools/Makefile.in @@ -108,7 +108,6 @@ am_gsid2mpr_OBJECTS = gsid2mpr-gsi_record.$(OBJEXT) \ gsid2mpr_OBJECTS = $(am_gsid2mpr_OBJECTS) am__DEPENDENCIES_1 = gsid2mpr_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) gsid2mpr_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ @@ -121,7 +120,6 @@ am_gsidens2orank_OBJECTS = gsidens2orank-gsi_record.$(OBJEXT) \ gsidens2orank-rad_config.$(OBJEXT) gsidens2orank_OBJECTS = $(am_gsidens2orank_OBJECTS) gsidens2orank_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -394,15 +392,15 @@ gsid2mpr_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ - -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ + -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ -lvx_nc_util \ @@ -418,6 +416,7 @@ gsid2mpr_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util gsidens2orank_SOURCES = gsidens2orank.h \ @@ -445,15 +444,15 @@ gsidens2orank_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_shapedata \ -lvx_util \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ - -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ + -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ -lvx_nc_util \ @@ -469,6 +468,7 @@ gsidens2orank_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lvx_util all: all-am diff --git a/src/tools/other/ioda2nc/Makefile.am b/src/tools/other/ioda2nc/Makefile.am index 1ed02ca762..d393417c51 100644 --- a/src/tools/other/ioda2nc/Makefile.am +++ b/src/tools/other/ioda2nc/Makefile.am @@ -21,11 +21,12 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_nc_util \ @@ -42,7 +43,7 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \ $(FLIBS) diff --git a/src/tools/other/ioda2nc/Makefile.in b/src/tools/other/ioda2nc/Makefile.in index 6a920cef5c..a4b16c47aa 100644 --- a/src/tools/other/ioda2nc/Makefile.in +++ b/src/tools/other/ioda2nc/Makefile.in @@ -106,7 +106,6 @@ am_ioda2nc_OBJECTS = ioda2nc-ioda2nc.$(OBJEXT) \ ioda2nc_OBJECTS = $(am_ioda2nc_OBJECTS) am__DEPENDENCIES_1 = ioda2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -355,11 +354,12 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_nc_util \ @@ -376,7 +376,7 @@ ioda2nc_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \ $(FLIBS) diff --git a/src/tools/other/lidar2nc/Makefile.am b/src/tools/other/lidar2nc/Makefile.am index 6a51c3224a..5692fe6373 100644 --- a/src/tools/other/lidar2nc/Makefile.am +++ b/src/tools/other/lidar2nc/Makefile.am @@ -24,9 +24,9 @@ lidar2nc_LDADD = -lvx_shapedata \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_nc_obs \ -lvx_nc_util \ @@ -46,13 +46,14 @@ lidar2nc_LDADD = -lvx_shapedata \ -lvx_geodesy \ -lvx_util_math \ -lvx_util \ + $(PYTHON_MET_LIBS) \ -lvx_config \ -lvx_gsl_prob \ -lvx_math \ -lvx_cal \ -lvx_log \ -lvx_util \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_summary \ -lmfhdf -ldf -ljpeg \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz diff --git a/src/tools/other/lidar2nc/Makefile.in b/src/tools/other/lidar2nc/Makefile.in index ca596d443f..2f6da2bc07 100644 --- a/src/tools/other/lidar2nc/Makefile.in +++ b/src/tools/other/lidar2nc/Makefile.in @@ -107,7 +107,7 @@ lidar2nc_OBJECTS = $(am_lidar2nc_OBJECTS) am__DEPENDENCIES_1 = lidar2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) lidar2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(lidar2nc_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) @@ -358,9 +358,9 @@ lidar2nc_LDADD = -lvx_shapedata \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_nc_obs \ -lvx_nc_util \ @@ -380,13 +380,14 @@ lidar2nc_LDADD = -lvx_shapedata \ -lvx_geodesy \ -lvx_util_math \ -lvx_util \ + $(PYTHON_MET_LIBS) \ -lvx_config \ -lvx_gsl_prob \ -lvx_math \ -lvx_cal \ -lvx_log \ -lvx_util \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_summary \ -lmfhdf -ldf -ljpeg \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz diff --git a/src/tools/other/madis2nc/Makefile.am b/src/tools/other/madis2nc/Makefile.am index 2763c9e6cd..0cfef882c0 100644 --- a/src/tools/other/madis2nc/Makefile.am +++ b/src/tools/other/madis2nc/Makefile.am @@ -20,11 +20,12 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_nc_util \ @@ -41,7 +42,7 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = madis2nc.h \ diff --git a/src/tools/other/madis2nc/Makefile.in b/src/tools/other/madis2nc/Makefile.in index fdcf482c19..7055ee7a03 100644 --- a/src/tools/other/madis2nc/Makefile.in +++ b/src/tools/other/madis2nc/Makefile.in @@ -106,7 +106,6 @@ am_madis2nc_OBJECTS = madis2nc-madis2nc.$(OBJEXT) \ madis2nc_OBJECTS = $(am_madis2nc_OBJECTS) am__DEPENDENCIES_1 = madis2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) madis2nc_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ @@ -340,11 +339,12 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_nc_util \ @@ -361,7 +361,7 @@ madis2nc_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = madis2nc.h \ diff --git a/src/tools/other/mode_graphics/Makefile.am b/src/tools/other/mode_graphics/Makefile.am index 7c680e38a9..e8027d814e 100644 --- a/src/tools/other/mode_graphics/Makefile.am +++ b/src/tools/other/mode_graphics/Makefile.am @@ -26,8 +26,8 @@ plot_mode_field_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_plot_util \ -lvx_data2d_nc_met \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_grid \ -lvx_geodesy \ @@ -43,7 +43,9 @@ plot_mode_field_LDADD = -lvx_config \ -lvx_config \ -lvx_cal \ -lvx_math \ - -lcairo -lfreetype -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz + $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ + -lcairo -lfreetype \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz # If we are in development mode, generate the "to_string" files and # clean them up in a "make clean". We don't want to do either of these diff --git a/src/tools/other/mode_graphics/Makefile.in b/src/tools/other/mode_graphics/Makefile.in index 90eb29de55..ead2e5dcb4 100644 --- a/src/tools/other/mode_graphics/Makefile.in +++ b/src/tools/other/mode_graphics/Makefile.in @@ -366,8 +366,8 @@ plot_mode_field_LDADD = -lvx_config \ -lvx_gsl_prob \ -lvx_plot_util \ -lvx_data2d_nc_met \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_grid \ -lvx_geodesy \ @@ -383,7 +383,9 @@ plot_mode_field_LDADD = -lvx_config \ -lvx_config \ -lvx_cal \ -lvx_math \ - -lcairo -lfreetype -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz + $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ + -lcairo -lfreetype \ + -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz all: all-am diff --git a/src/tools/other/mode_time_domain/Makefile.am b/src/tools/other/mode_time_domain/Makefile.am index a3f5123627..93fed7d4bb 100644 --- a/src/tools/other/mode_time_domain/Makefile.am +++ b/src/tools/other/mode_time_domain/Makefile.am @@ -51,11 +51,12 @@ mtd_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -70,6 +71,7 @@ mtd_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz # If we are in development mode, generate the "to_string" files and diff --git a/src/tools/other/mode_time_domain/Makefile.in b/src/tools/other/mode_time_domain/Makefile.in index 0caa6cd740..332ca93ac2 100644 --- a/src/tools/other/mode_time_domain/Makefile.in +++ b/src/tools/other/mode_time_domain/Makefile.in @@ -411,11 +411,12 @@ mtd_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -430,6 +431,7 @@ mtd_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas -lz all: all-am diff --git a/src/tools/other/modis_regrid/Makefile.am b/src/tools/other/modis_regrid/Makefile.am index 66fda6b206..75b2bfaccc 100644 --- a/src/tools/other/modis_regrid/Makefile.am +++ b/src/tools/other/modis_regrid/Makefile.am @@ -33,10 +33,12 @@ modis_regrid_LDADD = -lvx_pxm \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + -lvx_data2d_nccf \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -51,6 +53,7 @@ modis_regrid_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ -lhdfeos \ -lmfhdf \ diff --git a/src/tools/other/modis_regrid/Makefile.in b/src/tools/other/modis_regrid/Makefile.in index 42992d286c..65c244e36a 100644 --- a/src/tools/other/modis_regrid/Makefile.in +++ b/src/tools/other/modis_regrid/Makefile.in @@ -362,10 +362,12 @@ modis_regrid_LDADD = -lvx_pxm \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ -lvx_data2d_nccf \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + -lvx_data2d_nccf \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -380,6 +382,7 @@ modis_regrid_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ -lhdfeos \ -lmfhdf \ diff --git a/src/tools/other/pb2nc/Makefile.am b/src/tools/other/pb2nc/Makefile.am index 8067c0689b..5de5fc4210 100644 --- a/src/tools/other/pb2nc/Makefile.am +++ b/src/tools/other/pb2nc/Makefile.am @@ -38,11 +38,12 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_nc_util \ @@ -59,7 +60,7 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \ $(FLIBS) diff --git a/src/tools/other/pb2nc/Makefile.in b/src/tools/other/pb2nc/Makefile.in index 850d313279..06d60500ae 100644 --- a/src/tools/other/pb2nc/Makefile.in +++ b/src/tools/other/pb2nc/Makefile.in @@ -109,7 +109,6 @@ pb2nc_OBJECTS = $(am_pb2nc_OBJECTS) am__DEPENDENCIES_1 = @BUFRLIB_NAME_SET_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) pb2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) @@ -382,11 +381,12 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_obs \ -lvx_nc_util \ @@ -403,7 +403,7 @@ pb2nc_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas $(BLIB_NAME) \ $(FLIBS) diff --git a/src/tools/other/plot_data_plane/Makefile.am b/src/tools/other/plot_data_plane/Makefile.am index 76d6262cd0..5251524faa 100644 --- a/src/tools/other/plot_data_plane/Makefile.am +++ b/src/tools/other/plot_data_plane/Makefile.am @@ -16,11 +16,12 @@ plot_data_plane_CPPFLAGS = ${MET_CPPFLAGS} plot_data_plane_LDFLAGS = ${MET_LDFLAGS} plot_data_plane_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ @@ -42,4 +43,5 @@ plot_data_plane_LDADD = -lvx_data2d_factory \ -lvx_math \ -lvx_cal \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lz -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/src/tools/other/plot_data_plane/Makefile.in b/src/tools/other/plot_data_plane/Makefile.in index 3944a095f2..eb0af931e5 100644 --- a/src/tools/other/plot_data_plane/Makefile.in +++ b/src/tools/other/plot_data_plane/Makefile.in @@ -335,11 +335,12 @@ plot_data_plane_CPPFLAGS = ${MET_CPPFLAGS} plot_data_plane_LDFLAGS = ${MET_LDFLAGS} plot_data_plane_LDADD = -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ @@ -361,6 +362,7 @@ plot_data_plane_LDADD = -lvx_data2d_factory \ -lvx_math \ -lvx_cal \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lz -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/src/tools/other/plot_point_obs/Makefile.am b/src/tools/other/plot_point_obs/Makefile.am index fa00e0fb6a..17dbb404e0 100644 --- a/src/tools/other/plot_point_obs/Makefile.am +++ b/src/tools/other/plot_point_obs/Makefile.am @@ -18,11 +18,12 @@ plot_point_obs_LDFLAGS = ${MET_LDFLAGS} plot_point_obs_LDADD = -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_statistics \ @@ -46,7 +47,7 @@ plot_point_obs_LDADD = -lvx_statistics \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = plot_point_obs.h \ plot_point_obs_conf_info.h diff --git a/src/tools/other/plot_point_obs/Makefile.in b/src/tools/other/plot_point_obs/Makefile.in index 18bf672fc4..c5e166b45c 100644 --- a/src/tools/other/plot_point_obs/Makefile.in +++ b/src/tools/other/plot_point_obs/Makefile.in @@ -106,7 +106,6 @@ am_plot_point_obs_OBJECTS = plot_point_obs-plot_point_obs.$(OBJEXT) \ plot_point_obs_OBJECTS = $(am_plot_point_obs_OBJECTS) am__DEPENDENCIES_1 = plot_point_obs_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) @@ -340,11 +339,12 @@ plot_point_obs_LDFLAGS = ${MET_LDFLAGS} plot_point_obs_LDADD = -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_statistics \ @@ -368,7 +368,7 @@ plot_point_obs_LDADD = -lvx_statistics \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = plot_point_obs.h \ diff --git a/src/tools/other/point2grid/Makefile.am b/src/tools/other/point2grid/Makefile.am index 8af72bc09f..17b0987b89 100644 --- a/src/tools/other/point2grid/Makefile.am +++ b/src/tools/other/point2grid/Makefile.am @@ -18,11 +18,12 @@ point2grid_LDFLAGS = ${MET_LDFLAGS} point2grid_LDADD = -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_nc_obs \ @@ -38,5 +39,5 @@ point2grid_LDADD = -lvx_statistics \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/src/tools/other/point2grid/Makefile.in b/src/tools/other/point2grid/Makefile.in index cce0a68a8c..35e9722171 100644 --- a/src/tools/other/point2grid/Makefile.in +++ b/src/tools/other/point2grid/Makefile.in @@ -106,7 +106,6 @@ am_point2grid_OBJECTS = point2grid-point2grid.$(OBJEXT) \ point2grid_OBJECTS = $(am_point2grid_OBJECTS) am__DEPENDENCIES_1 = point2grid_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) point2grid_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ @@ -351,11 +350,12 @@ point2grid_LDFLAGS = ${MET_LDFLAGS} point2grid_LDADD = -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_nc_obs \ @@ -371,7 +371,7 @@ point2grid_LDADD = -lvx_statistics \ -lvx_math \ -lvx_cal \ -lvx_log \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/src/tools/other/regrid_data_plane/Makefile.am b/src/tools/other/regrid_data_plane/Makefile.am index 758dc5590a..e6ed355083 100644 --- a/src/tools/other/regrid_data_plane/Makefile.am +++ b/src/tools/other/regrid_data_plane/Makefile.am @@ -17,11 +17,12 @@ regrid_data_plane_LDFLAGS = ${MET_LDFLAGS} regrid_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ @@ -37,4 +38,5 @@ regrid_data_plane_LDADD = -lvx_statistics \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/src/tools/other/regrid_data_plane/Makefile.in b/src/tools/other/regrid_data_plane/Makefile.in index 7dbee11745..1cf17714f2 100644 --- a/src/tools/other/regrid_data_plane/Makefile.in +++ b/src/tools/other/regrid_data_plane/Makefile.in @@ -337,11 +337,12 @@ regrid_data_plane_LDFLAGS = ${MET_LDFLAGS} regrid_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ @@ -357,6 +358,7 @@ regrid_data_plane_LDADD = -lvx_statistics \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/src/tools/other/shift_data_plane/Makefile.am b/src/tools/other/shift_data_plane/Makefile.am index 2ff6d0ae98..d4854a1f75 100644 --- a/src/tools/other/shift_data_plane/Makefile.am +++ b/src/tools/other/shift_data_plane/Makefile.am @@ -17,11 +17,12 @@ shift_data_plane_LDFLAGS = ${MET_LDFLAGS} shift_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ @@ -37,4 +38,5 @@ shift_data_plane_LDADD = -lvx_statistics \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas diff --git a/src/tools/other/shift_data_plane/Makefile.in b/src/tools/other/shift_data_plane/Makefile.in index bc03b74407..6c53dfcdc4 100644 --- a/src/tools/other/shift_data_plane/Makefile.in +++ b/src/tools/other/shift_data_plane/Makefile.in @@ -337,11 +337,12 @@ shift_data_plane_LDFLAGS = ${MET_LDFLAGS} shift_data_plane_LDADD = -lvx_statistics \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_nc_util \ -lvx_data2d \ @@ -357,6 +358,7 @@ shift_data_plane_LDADD = -lvx_statistics \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/src/tools/other/wwmca_tool/Makefile.am b/src/tools/other/wwmca_tool/Makefile.am index b7a3bd7694..73603061ad 100644 --- a/src/tools/other/wwmca_tool/Makefile.am +++ b/src/tools/other/wwmca_tool/Makefile.am @@ -40,11 +40,12 @@ wwmca_regrid_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -59,6 +60,7 @@ wwmca_regrid_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas wwmca_plot_SOURCES = gridhemisphere_to_string.cc gridhemisphere_to_string.h \ @@ -87,11 +89,12 @@ wwmca_plot_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ @@ -105,6 +108,7 @@ wwmca_plot_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas # If we are in development mode, generate the "to_string" files and diff --git a/src/tools/other/wwmca_tool/Makefile.in b/src/tools/other/wwmca_tool/Makefile.in index 00733dddfe..f11d548391 100644 --- a/src/tools/other/wwmca_tool/Makefile.in +++ b/src/tools/other/wwmca_tool/Makefile.in @@ -419,11 +419,12 @@ wwmca_regrid_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -438,6 +439,7 @@ wwmca_regrid_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas wwmca_plot_SOURCES = gridhemisphere_to_string.cc gridhemisphere_to_string.h \ @@ -467,11 +469,12 @@ wwmca_plot_LDADD = -lvx_pxm \ -lvx_analysis_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_data2d \ -lvx_nc_util \ -lvx_regrid \ @@ -485,6 +488,7 @@ wwmca_plot_LDADD = -lvx_pxm \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lz -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas all: all-am diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.am b/src/tools/tc_utils/rmw_analysis/Makefile.am index 1174b06f89..46dfff3df2 100644 --- a/src/tools/tc_utils/rmw_analysis/Makefile.am +++ b/src/tools/tc_utils/rmw_analysis/Makefile.am @@ -22,11 +22,12 @@ rmw_analysis_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -42,6 +43,7 @@ rmw_analysis_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.in b/src/tools/tc_utils/rmw_analysis/Makefile.in index 0ea6f5bb2b..96b646a99a 100644 --- a/src/tools/tc_utils/rmw_analysis/Makefile.in +++ b/src/tools/tc_utils/rmw_analysis/Makefile.in @@ -343,11 +343,12 @@ rmw_analysis_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -363,6 +364,7 @@ rmw_analysis_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) diff --git a/src/tools/tc_utils/tc_diag/Makefile.am b/src/tools/tc_utils/tc_diag/Makefile.am index 413e5ee766..111277e4e8 100644 --- a/src/tools/tc_utils/tc_diag/Makefile.am +++ b/src/tools/tc_utils/tc_diag/Makefile.am @@ -23,11 +23,12 @@ tc_diag_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -43,6 +44,7 @@ tc_diag_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) diff --git a/src/tools/tc_utils/tc_diag/Makefile.in b/src/tools/tc_utils/tc_diag/Makefile.in index 7d58f52e33..89c097ddb9 100644 --- a/src/tools/tc_utils/tc_diag/Makefile.in +++ b/src/tools/tc_utils/tc_diag/Makefile.in @@ -346,11 +346,12 @@ tc_diag_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -366,6 +367,7 @@ tc_diag_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) diff --git a/src/tools/tc_utils/tc_dland/Makefile.am b/src/tools/tc_utils/tc_dland/Makefile.am index b3edfa55d5..25aa19a2b8 100644 --- a/src/tools/tc_utils/tc_dland/Makefile.am +++ b/src/tools/tc_utils/tc_dland/Makefile.am @@ -16,7 +16,7 @@ tc_dland_SOURCES = tc_dland.cc \ tc_dland_CPPFLAGS = ${MET_CPPFLAGS} tc_dland_LDFLAGS = ${MET_LDFLAGS} tc_dland_LDADD = -lvx_tc_util \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ -lvx_nc_util \ -lvx_grid \ -lvx_geodesy \ @@ -29,5 +29,6 @@ tc_dland_LDADD = -lvx_tc_util \ -lvx_gsl_prob \ -lvx_cal \ -lvx_math \ + $(UGRID_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) diff --git a/src/tools/tc_utils/tc_dland/Makefile.in b/src/tools/tc_utils/tc_dland/Makefile.in index 6b8655078a..66bc377e52 100644 --- a/src/tools/tc_utils/tc_dland/Makefile.in +++ b/src/tools/tc_utils/tc_dland/Makefile.in @@ -347,7 +347,7 @@ tc_dland_SOURCES = tc_dland.cc \ tc_dland_CPPFLAGS = ${MET_CPPFLAGS} tc_dland_LDFLAGS = ${MET_LDFLAGS} tc_dland_LDADD = -lvx_tc_util \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ -lvx_nc_util \ -lvx_grid \ -lvx_geodesy \ @@ -360,6 +360,7 @@ tc_dland_LDADD = -lvx_tc_util \ -lvx_gsl_prob \ -lvx_cal \ -lvx_math \ + $(UGRID_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) diff --git a/src/tools/tc_utils/tc_gen/Makefile.am b/src/tools/tc_utils/tc_gen/Makefile.am index 58fa294f4c..2cc13426ff 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.am +++ b/src/tools/tc_utils/tc_gen/Makefile.am @@ -23,11 +23,12 @@ tc_gen_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_gis \ -lvx_data2d \ @@ -46,6 +47,7 @@ tc_gen_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) diff --git a/src/tools/tc_utils/tc_gen/Makefile.in b/src/tools/tc_utils/tc_gen/Makefile.in index b7018796bc..263c36b038 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.in +++ b/src/tools/tc_utils/tc_gen/Makefile.in @@ -344,11 +344,12 @@ tc_gen_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_gis \ -lvx_data2d \ @@ -367,6 +368,7 @@ tc_gen_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) diff --git a/src/tools/tc_utils/tc_pairs/Makefile.am b/src/tools/tc_utils/tc_pairs/Makefile.am index 97807a6314..c44cd9b3ca 100644 --- a/src/tools/tc_utils/tc_pairs/Makefile.am +++ b/src/tools/tc_utils/tc_pairs/Makefile.am @@ -25,11 +25,12 @@ tc_pairs_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -46,6 +47,7 @@ tc_pairs_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) diff --git a/src/tools/tc_utils/tc_pairs/Makefile.in b/src/tools/tc_utils/tc_pairs/Makefile.in index ce571a3584..ef0f4a5583 100644 --- a/src/tools/tc_utils/tc_pairs/Makefile.in +++ b/src/tools/tc_utils/tc_pairs/Makefile.in @@ -370,11 +370,12 @@ tc_pairs_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -391,6 +392,7 @@ tc_pairs_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) diff --git a/src/tools/tc_utils/tc_rmw/Makefile.am b/src/tools/tc_utils/tc_rmw/Makefile.am index aef7f506d6..4bb5c11475 100644 --- a/src/tools/tc_utils/tc_rmw/Makefile.am +++ b/src/tools/tc_utils/tc_rmw/Makefile.am @@ -23,11 +23,12 @@ tc_rmw_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -43,6 +44,7 @@ tc_rmw_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) diff --git a/src/tools/tc_utils/tc_rmw/Makefile.in b/src/tools/tc_utils/tc_rmw/Makefile.in index 4c0fb15140..05d4f518e3 100644 --- a/src/tools/tc_utils/tc_rmw/Makefile.in +++ b/src/tools/tc_utils/tc_rmw/Makefile.in @@ -346,11 +346,12 @@ tc_rmw_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_nc_util \ @@ -366,6 +367,7 @@ tc_rmw_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas \ $(FLIBS) diff --git a/src/tools/tc_utils/tc_stat/Makefile.am b/src/tools/tc_utils/tc_stat/Makefile.am index d40a6cfdee..8a53668656 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.am +++ b/src/tools/tc_utils/tc_stat/Makefile.am @@ -25,11 +25,12 @@ tc_stat_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ @@ -48,6 +49,7 @@ tc_stat_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = tc_stat_conf_info.h \ diff --git a/src/tools/tc_utils/tc_stat/Makefile.in b/src/tools/tc_utils/tc_stat/Makefile.in index 3e406c4a19..91e9944932 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.in +++ b/src/tools/tc_utils/tc_stat/Makefile.in @@ -348,11 +348,12 @@ tc_stat_LDADD = -lvx_stat_out \ -lvx_tc_util \ -lvx_data2d_factory \ -lvx_data2d_nc_met \ - -lvx_data2d_grib $(GRIB2_MET_LIBS) $(GRIB2_DEP_LIBS) \ + -lvx_data2d_grib \ + $(GRIB2_MET_LIBS) \ -lvx_data2d_nc_pinterp \ - $(PYTHON_MET_LIBS) $(PYTHON_DEP_LIBS) \ -lvx_data2d_nccf \ - $(UGRID_MET_LIBS) $(UGRID_DEP_LIBS) \ + $(UGRID_MET_LIBS) \ + $(PYTHON_MET_LIBS) \ -lvx_statistics \ -lvx_data2d \ -lvx_seeps \ @@ -371,6 +372,7 @@ tc_stat_LDADD = -lvx_stat_out \ -lvx_math \ -lvx_color \ -lvx_log \ + $(GRIB2_DEP_LIBS) $(UGRID_DEP_LIBS) $(PYTHON_DEP_LIBS) \ -lm -lproj -lnetcdf_c++4 -lnetcdf -lgsl -lgslcblas EXTRA_DIST = tc_stat_conf_info.h \ From 7edab894f910e0247af09e31d9c976ff5aec6fe1 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Wed, 15 Nov 2023 14:54:10 -0700 Subject: [PATCH 104/109] Per #2231, add unit_ugrid.xml to the unit tests run by Unit 2a in the GHA testing.yml workflow. --- .github/workflows/testing.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 40c22d80e9..fcfb898db0 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -294,6 +294,7 @@ jobs: - 'grid_stat stat_analysis_gs' - 'wavelet_stat stat_analysis_ws' - 'ensemble_stat stat_analysis_es' + - 'ugrid' fail-fast: false steps: - uses: actions/checkout@v3 From d8418bddc29855392cd694aebcafcefb9bd50f72 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Thu, 16 Nov 2023 08:35:06 -0700 Subject: [PATCH 105/109] #2231 Changed a warning to an error with multiple vertical levels --- src/libcode/vx_data2d_ugrid/var_info_ugrid.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc b/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc index bce434a950..a40844de76 100644 --- a/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc +++ b/src/libcode/vx_data2d_ugrid/var_info_ugrid.cc @@ -352,9 +352,10 @@ void VarInfoUGrid::set_dict(Dictionary &dict){ else set_magic(cfg_name, cfg_level); if (Level.lower() != Level.upper()) { - mlog << Warning << "\n" << method_name - << "Recommend to select the single vertical level for UGrid instead of multiple levels (" - << cfg_level << ")\n\n"; + mlog << Error << "\n" << method_name + << "Multiple vertical levels (" + << cfg_level << ") for UGrid are not supported\n\n"; + exit(1); } set_req_name(cfg_name.c_str()); From f64df427df00578e78f5d155d6d4caec0147a00d Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Thu, 16 Nov 2023 08:36:00 -0700 Subject: [PATCH 106/109] #2231 Changed error message (metadata file to coordinates file) --- src/libcode/vx_data2d_ugrid/ugrid_file.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcode/vx_data2d_ugrid/ugrid_file.cc b/src/libcode/vx_data2d_ugrid/ugrid_file.cc index c643e49c1e..13cfde1f6f 100644 --- a/src/libcode/vx_data2d_ugrid/ugrid_file.cc +++ b/src/libcode/vx_data2d_ugrid/ugrid_file.cc @@ -226,7 +226,7 @@ bool UGridFile::open_metadata(const char * filepath) if (face_count != data_face_count) { mlog << Error << "\n" << method_name << meta_name << " dimension is different: data file = " - << data_face_count << ", metadata file = " << face_count << "\n\n"; + << data_face_count << ", coordinates file = " << face_count << "\n\n"; exit(1); } } From 4fbad9454c8d8a3463404cd49d9254185fe3b04b Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Thu, 16 Nov 2023 09:08:48 -0700 Subject: [PATCH 107/109] #2231 Select only 1 vertical level (disabled multiptle levels) --- internal/test_unit/config/PointStatConfig_ugrid_mpas_diag | 2 +- internal/test_unit/config/PointStatConfig_ugrid_mpas_out | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/test_unit/config/PointStatConfig_ugrid_mpas_diag b/internal/test_unit/config/PointStatConfig_ugrid_mpas_diag index 5e87ed2ce5..ca0ef81ae7 100644 --- a/internal/test_unit/config/PointStatConfig_ugrid_mpas_diag +++ b/internal/test_unit/config/PointStatConfig_ugrid_mpas_diag @@ -47,7 +47,7 @@ fcst = { obs_quality_exc = []; field = [ - { name = "temperature"; level = "P1000-500"; message_type = "ADPSFC"; } + { name = "temperature"; level = "P925"; message_type = "ADPSFC"; } ]; } diff --git a/internal/test_unit/config/PointStatConfig_ugrid_mpas_out b/internal/test_unit/config/PointStatConfig_ugrid_mpas_out index 2cdba532e6..1e1f9e4887 100644 --- a/internal/test_unit/config/PointStatConfig_ugrid_mpas_out +++ b/internal/test_unit/config/PointStatConfig_ugrid_mpas_out @@ -47,7 +47,7 @@ fcst = { obs_quality_exc = []; field = [ - { name = "theta"; level = "L2-4"; message_type = "ADPSFC"; } + { name = "theta"; level = "L2"; message_type = "ADPSFC"; } ]; } From 70fb75ebb07672bcf63a67cc6d587da93f73a633 Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Thu, 16 Nov 2023 13:15:14 -0700 Subject: [PATCH 108/109] #2231 Merged develop branch --- Makefile.in | 54 +- aclocal.m4 | 81 +- config.h.in | 7 +- configure | 5812 +++++++---------- data/Makefile.in | 13 +- data/climo/Makefile.in | 13 +- data/climo/seeps/Makefile.in | 11 +- data/colortables/Makefile.in | 13 +- data/colortables/NCL_colortables/Makefile.in | 11 +- data/config/Makefile.in | 11 +- data/map/Makefile.in | 15 +- data/map/admin_by_country/Makefile.in | 11 +- data/poly/HMT_masks/Makefile.in | 11 +- data/poly/Makefile.in | 13 +- data/poly/NCEP_masks/Makefile.in | 11 +- data/ps/Makefile.in | 11 +- data/table_files/Makefile.in | 11 +- data/tc_data/Makefile.in | 11 +- internal/test_util/Makefile.in | 13 +- internal/test_util/basic/Makefile.in | 13 +- .../test_util/basic/vx_config/Makefile.in | 13 +- internal/test_util/basic/vx_log/Makefile.in | 13 +- internal/test_util/basic/vx_util/Makefile.in | 13 +- internal/test_util/libcode/Makefile.in | 13 +- .../test_util/libcode/vx_data2d/Makefile.in | 13 +- .../libcode/vx_data2d_factory/Makefile.in | 13 +- .../libcode/vx_data2d_grib/Makefile.in | 13 +- .../libcode/vx_data2d_nc_met/Makefile.in | 13 +- .../libcode/vx_data2d_nccf/Makefile.in | 13 +- .../test_util/libcode/vx_geodesy/Makefile.in | 13 +- .../test_util/libcode/vx_grid/Makefile.in | 13 +- .../test_util/libcode/vx_nc_util/Makefile.in | 13 +- .../test_util/libcode/vx_physics/Makefile.in | 13 +- .../libcode/vx_plot_util/Makefile.in | 13 +- internal/test_util/libcode/vx_ps/Makefile.in | 13 +- .../libcode/vx_series_data/Makefile.in | 13 +- .../test_util/libcode/vx_solar/Makefile.in | 13 +- .../test_util/libcode/vx_tc_util/Makefile.in | 13 +- internal/test_util/tools/Makefile.in | 13 +- internal/test_util/tools/other/Makefile.in | 13 +- .../tools/other/mode_time_domain/Makefile.in | 13 +- scripts/Rscripts/Makefile.in | 13 +- scripts/Rscripts/include/Makefile.in | 11 +- scripts/python/Makefile.in | 13 +- scripts/python/examples/Makefile.in | 11 +- scripts/python/met/Makefile.in | 11 +- scripts/python/pyembed/Makefile.in | 13 +- scripts/python/tc_diag/Makefile.in | 11 +- scripts/python/utility/Makefile.in | 11 +- src/Makefile.in | 13 +- src/basic/Makefile.in | 13 +- src/basic/enum_to_string/Makefile.in | 13 +- src/basic/vx_cal/Makefile.in | 13 +- src/basic/vx_config/Makefile.in | 13 +- src/basic/vx_log/Makefile.in | 13 +- src/basic/vx_math/Makefile.in | 13 +- src/basic/vx_util/Makefile.in | 13 +- src/basic/vx_util_math/Makefile.in | 13 +- src/libcode/Makefile.in | 13 +- src/libcode/vx_afm/Makefile.in | 13 +- src/libcode/vx_analysis_util/Makefile.in | 13 +- src/libcode/vx_bool_calc/Makefile.in | 13 +- src/libcode/vx_color/Makefile.in | 13 +- src/libcode/vx_data2d/Makefile.in | 13 +- src/libcode/vx_data2d_factory/Makefile.in | 13 +- src/libcode/vx_data2d_grib/Makefile.in | 13 +- src/libcode/vx_data2d_grib2/Makefile.in | 13 +- src/libcode/vx_data2d_nc_met/Makefile.in | 13 +- src/libcode/vx_data2d_nc_pinterp/Makefile.in | 13 +- src/libcode/vx_data2d_nccf/Makefile.in | 13 +- src/libcode/vx_data2d_python/Makefile.in | 13 +- src/libcode/vx_data2d_ugrid/Makefile.in | 13 +- src/libcode/vx_geodesy/Makefile.in | 13 +- src/libcode/vx_gis/Makefile.in | 13 +- src/libcode/vx_gnomon/Makefile.in | 13 +- src/libcode/vx_grid/Makefile.in | 13 +- src/libcode/vx_gsl_prob/Makefile.in | 13 +- src/libcode/vx_nav/Makefile.in | 13 +- src/libcode/vx_nc_obs/Makefile.in | 13 +- src/libcode/vx_nc_util/Makefile.in | 13 +- src/libcode/vx_pb_util/Makefile.in | 13 +- src/libcode/vx_physics/Makefile.in | 13 +- src/libcode/vx_plot_util/Makefile.in | 13 +- src/libcode/vx_pointdata_python/Makefile.in | 13 +- src/libcode/vx_ps/Makefile.in | 13 +- src/libcode/vx_pxm/Makefile.in | 13 +- src/libcode/vx_python3_utils/Makefile.in | 13 +- src/libcode/vx_regrid/Makefile.in | 13 +- src/libcode/vx_render/Makefile.in | 13 +- src/libcode/vx_seeps/Makefile.in | 13 +- src/libcode/vx_series_data/Makefile.in | 13 +- src/libcode/vx_shapedata/Makefile.in | 13 +- src/libcode/vx_solar/Makefile.in | 13 +- src/libcode/vx_stat_out/Makefile.in | 13 +- src/libcode/vx_statistics/Makefile.in | 13 +- src/libcode/vx_summary/Makefile.in | 13 +- src/libcode/vx_tc_util/Makefile.in | 13 +- src/libcode/vx_time_series/Makefile.in | 13 +- src/tools/Makefile.in | 13 +- src/tools/core/Makefile.in | 13 +- src/tools/core/ensemble_stat/Makefile.in | 13 +- src/tools/core/grid_stat/Makefile.in | 13 +- src/tools/core/mode/Makefile.in | 13 +- src/tools/core/mode_analysis/Makefile.in | 13 +- src/tools/core/pcp_combine/Makefile.in | 13 +- src/tools/core/point_stat/Makefile.in | 13 +- src/tools/core/series_analysis/Makefile.in | 13 +- src/tools/core/stat_analysis/Makefile.in | 13 +- src/tools/core/wavelet_stat/Makefile.in | 13 +- src/tools/dev_utils/Makefile.in | 13 +- src/tools/dev_utils/shapefiles/Makefile.in | 13 +- src/tools/other/Makefile.in | 13 +- src/tools/other/ascii2nc/Makefile.in | 13 +- src/tools/other/gen_ens_prod/Makefile.in | 13 +- src/tools/other/gen_vx_mask/Makefile.in | 13 +- src/tools/other/gis_utils/Makefile.in | 13 +- src/tools/other/grid_diag/Makefile.in | 13 +- src/tools/other/gsi_tools/Makefile.in | 13 +- src/tools/other/ioda2nc/Makefile.in | 13 +- src/tools/other/lidar2nc/Makefile.in | 13 +- src/tools/other/madis2nc/Makefile.in | 13 +- src/tools/other/mode_graphics/Makefile.in | 13 +- src/tools/other/mode_time_domain/Makefile.in | 13 +- src/tools/other/modis_regrid/Makefile.in | 13 +- src/tools/other/pb2nc/Makefile.in | 13 +- src/tools/other/plot_data_plane/Makefile.in | 13 +- src/tools/other/plot_point_obs/Makefile.in | 13 +- src/tools/other/point2grid/Makefile.in | 13 +- src/tools/other/regrid_data_plane/Makefile.in | 13 +- src/tools/other/shift_data_plane/Makefile.in | 13 +- src/tools/other/wwmca_tool/Makefile.in | 13 +- src/tools/tc_utils/Makefile.in | 13 +- src/tools/tc_utils/rmw_analysis/Makefile.in | 13 +- src/tools/tc_utils/tc_diag/Makefile.in | 13 +- src/tools/tc_utils/tc_dland/Makefile.in | 13 +- src/tools/tc_utils/tc_gen/Makefile.in | 13 +- src/tools/tc_utils/tc_pairs/Makefile.in | 13 +- src/tools/tc_utils/tc_rmw/Makefile.in | 13 +- src/tools/tc_utils/tc_stat/Makefile.in | 13 +- 139 files changed, 3474 insertions(+), 4209 deletions(-) diff --git a/Makefile.in b/Makefile.in index 582d2a65c8..d5a0a487eb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -136,8 +136,8 @@ am__recursive_targets = \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir distdir-am dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ - config.h.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -154,11 +154,14 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = data src scripts/Rscripts scripts/python \ internal/test_util am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in INSTALL \ - README.md compile config.guess config.sub depcomp install-sh \ - missing ylwrap + compile config.guess config.sub depcomp install-sh missing \ + ylwrap DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -197,8 +200,6 @@ am__relativize = \ DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best DIST_TARGETS = dist-gzip -# Exists only to be overridden by the user if desired. -AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -214,9 +215,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -226,12 +226,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -536,6 +537,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -622,10 +624,6 @@ dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) -dist-zstd: distdir - tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst - $(am__post_remove_distdir) - dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -668,8 +666,6 @@ distcheck: dist eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ - *.tar.zst*) \ - zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -685,7 +681,7 @@ distcheck: dist $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -847,17 +843,17 @@ uninstall-am: am--refresh check check-am clean clean-cscope clean-generic \ cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \ - dist-zip dist-zstd distcheck distclean distclean-generic \ - distclean-hdr 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-am uninstall uninstall-am + dist-zip distcheck distclean distclean-generic distclean-hdr \ + 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-am uninstall \ + uninstall-am .PRECIOUS: Makefile diff --git a/aclocal.m4 b/aclocal.m4 index b58d8d33ae..3aee821715 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.5 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,13 +14,13 @@ 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.71],, -[m4_warning([this file was generated for autoconf 2.71. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. 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'.])]) -# Copyright (C) 2002-2021 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.16' 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.16.5], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ 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.16.5])dnl +[AM_AUTOMAKE_VERSION([1.16.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_COND_IF -*- Autoconf -*- -# Copyright (C) 2008-2021 Free Software Foundation, Inc. +# Copyright (C) 2008-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -147,7 +147,7 @@ fi[]dnl # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2021 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -178,7 +178,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -369,7 +369,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -408,9 +408,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. If GNU make was not used, consider - re-running the configure script with MAKE="gmake" (or whatever is - necessary). You can also try re-running configure with the + for automatic dependency tracking. Try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -437,7 +435,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -465,10 +463,6 @@ m4_defn([AC_PROG_CC]) # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl -m4_ifdef([_$0_ALREADY_INIT], - [m4_fatal([$0 expanded multiple times -]m4_defn([_$0_ALREADY_INIT]))], - [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -505,7 +499,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. m4_if( - m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl @@ -557,20 +551,6 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [m4_define([AC_PROG_OBJCXX], m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -# Variables for tags utilities; see am/tags.am -if test -z "$CTAGS"; then - CTAGS=ctags -fi -AC_SUBST([CTAGS]) -if test -z "$ETAGS"; then - ETAGS=etags -fi -AC_SUBST([ETAGS]) -if test -z "$CSCOPE"; then - CSCOPE=cscope -fi -AC_SUBST([CSCOPE]) - AC_REQUIRE([AM_SILENT_RULES])dnl dnl The testsuite driver may need to know about EXEEXT, so add the dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This @@ -652,7 +632,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -673,7 +653,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2021 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -694,7 +674,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -737,7 +717,7 @@ AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2021 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -758,7 +738,12 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - MISSING="\${SHELL} '$am_aux_dir/missing'" + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then @@ -771,7 +756,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -800,7 +785,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2021 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -847,7 +832,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -866,7 +851,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2021 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -947,7 +932,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2021 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1007,7 +992,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2021 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1035,7 +1020,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2021 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1054,7 +1039,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2021 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/config.h.in b/config.h.in index 416f29bcdb..c686129b5e 100644 --- a/config.h.in +++ b/config.h.in @@ -147,9 +147,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H -/* Define to 1 if you have the header file. */ -#undef HAVE_STDIO_H - /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H @@ -219,9 +216,7 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define to 1 if all of the C90 standard headers exist (not just the ones - required in a freestanding environment). This macro is provided for - backward compatibility; new code need not use it. */ +/* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS /* Version number of package */ diff --git a/configure b/configure index 483ddd8b88..cd5180c8ae 100755 --- a/configure +++ b/configure @@ -1,12 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for MET development. +# Generated by GNU Autoconf 2.69 for MET development. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, -# Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -17,16 +16,14 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: -if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop +else case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -36,46 +33,46 @@ esac fi - -# Reset variables that may have inherited troublesome values from -# the environment. - -# IFS needs to be set, to space, tab, and newline, in precisely that order. -# (If _AS_PATH_WALK were called with IFS unset, it would have the -# side effect of setting IFS to empty, thus disabling word splitting.) -# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -IFS=" "" $as_nl" - -PS1='$ ' -PS2='> ' -PS4='+ ' - -# Ensure predictable behavior from utilities with locale-dependent output. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# We cannot yet rely on "unset" to work, but we need these variables -# to be unset--not just set to an empty or harmless value--now, to -# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct -# also avoids known problems related to "unset" and subshell syntax -# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). -for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH -do eval test \${$as_var+y} \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done - -# Ensure that fds 0, 1, and 2 are open. -if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi -if (exec 3>&2) ; then :; else exec 2>/dev/null; fi +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi # The user is always right. -if ${PATH_SEPARATOR+false} :; then +if test "${PATH_SEPARATOR+set}" != set; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -84,6 +81,13 @@ if ${PATH_SEPARATOR+false} :; then fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -92,12 +96,8 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - test -r "$as_dir$0" && as_myself=$as_dir$0 && break + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done IFS=$as_save_IFS @@ -109,10 +109,30 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -134,22 +154,20 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="as_nop=: -if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else \$as_nop +else case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -169,52 +187,42 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ) -then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : -else \$as_nop +else exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 -blah=\$(echo \$(echo blah)) -test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1" - if (eval "$as_required") 2>/dev/null -then : + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : as_have_required=yes -else $as_nop +else as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null -then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -else $as_nop +else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir$as_base + as_shell=$as_dir/$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null -then : + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : CONFIG_SHELL=$as_shell as_have_required=yes - if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null -then : + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : break 2 fi fi @@ -222,21 +230,14 @@ fi esac as_found=false done -IFS=$as_save_IFS -if $as_found -then : - -else $as_nop - if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null -then : +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : CONFIG_SHELL=$SHELL as_have_required=yes -fi -fi +fi; } +IFS=$as_save_IFS - if test "x$CONFIG_SHELL" != x -then : + if test "x$CONFIG_SHELL" != x; then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -254,19 +255,18 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno -then : - printf "%s\n" "$0: This script requires a shell more modern than all" - printf "%s\n" "$0: the shells that I found on your system." - if test ${ZSH_VERSION+y} ; then - printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" - printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and + $as_echo "$0: Please tell bug-autoconf@gnu.org and $0: https://github.com/dtcenter/METplus/discussions about $0: your system, including any error possibly output before $0: this message. Then install a modern shell, or manually @@ -294,7 +294,6 @@ as_fn_unset () } as_unset=as_fn_unset - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -312,14 +311,6 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -334,7 +325,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -343,7 +334,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -382,13 +373,12 @@ as_fn_executable_p () # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null -then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : eval 'as_fn_append () { eval $1+=\$2 }' -else $as_nop +else as_fn_append () { eval $1=\$$1\$2 @@ -400,27 +390,18 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null -then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else $as_nop +else as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith -# as_fn_nop -# --------- -# Do nothing but, unlike ":", preserve the value of $?. -as_fn_nop () -{ - return $? -} -as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -432,9 +413,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - printf "%s\n" "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -461,7 +442,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -505,7 +486,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -519,10 +500,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } - -# Determine whether it's possible to make 'echo' print without a newline. -# These variables are no longer used directly by Autoconf, but are AC_SUBSTed -# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -536,13 +513,6 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac -# For backward compatibility with old third-party macros, we provide -# the shell variables $as_echo and $as_echo_n. New code should use -# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. -as_echo='printf %s\n' -as_echo_n='printf %s' - - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -618,40 +588,47 @@ PACKAGE_URL='http://dtcenter.org/community-code/model-evaluation-tools-met' ac_unique_file="src/tools/tc_utils/tc_dland/tc_dland.cc" # Factoring default headers for most tests. ac_includes_default="\ -#include -#ifdef HAVE_STDIO_H -# include +#include +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include #endif -#ifdef HAVE_STDLIB_H +#ifdef STDC_HEADERS # include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif #endif #ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include +# endif # include #endif +#ifdef HAVE_STRINGS_H +# include +#endif #ifdef HAVE_INTTYPES_H # include #endif #ifdef HAVE_STDINT_H # include #endif -#ifdef HAVE_STRINGS_H -# include -#endif -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include -#endif #ifdef HAVE_UNISTD_H # include #endif" -ac_header_c_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +EGREP +GREP +CPP FLIBS host_os host_vendor @@ -816,9 +793,6 @@ AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V -CSCOPE -ETAGS -CTAGS am__untar am__tar AMTAR @@ -976,7 +950,8 @@ CXX CXXFLAGS CCC F77 -FFLAGS' +FFLAGS +CPP' # Initialize some variables set by options. @@ -1045,6 +1020,8 @@ do *) ac_optarg=yes ;; esac + # Accept the important Cygnus configure options, so we can diagnose typos. + case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -1085,9 +1062,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1111,9 +1088,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: \`$ac_useropt'" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1324,9 +1301,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1340,9 +1317,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: \`$ac_useropt'" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt - ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1386,9 +1363,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1404,7 +1381,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1468,7 +1445,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_myself" | +$as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1826,6 +1803,7 @@ Some influential environment variables: CXXFLAGS C++ compiler flags F77 Fortran 77 compiler command FFLAGS Fortran 77 compiler flags + CPP C preprocessor Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1847,9 +1825,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1877,8 +1855,7 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for configure.gnu first; this name is used for a wrapper for - # Metaconfig's "Configure" on case-insensitive file systems. + # Check for guested configure. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -1886,7 +1863,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1896,9 +1873,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF MET configure development -generated by GNU Autoconf 2.71 +generated by GNU Autoconf 2.69 -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1915,14 +1892,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam + rm -f conftest.$ac_objext if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1930,15 +1907,14 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext -then : + } && test -s conftest.$ac_objext; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1954,14 +1930,14 @@ fi ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext + rm -f conftest.$ac_objext conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1969,18 +1945,17 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - } -then : + }; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -2001,14 +1976,14 @@ fi ac_fn_cxx_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam + rm -f conftest.$ac_objext if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2016,15 +1991,14 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext -then : + } && test -s conftest.$ac_objext; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -2040,14 +2014,14 @@ fi ac_fn_f77_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest.beam + rm -f conftest.$ac_objext if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2055,15 +2029,14 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_f77_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext -then : + } && test -s conftest.$ac_objext; then : ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -2073,6 +2046,176 @@ fi } # ac_fn_f77_try_compile +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if eval \${$3+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.i conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} +( $as_echo "## -------------------------------------------------------------- ## +## Report this to https://github.com/dtcenter/METplus/discussions ## +## -------------------------------------------------------------- ##" + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_mongrel + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists and can be compiled using the include files in @@ -2080,28 +2223,26 @@ fi ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : eval "$3=yes" -else $as_nop +else eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -2113,18 +2254,17 @@ printf "%s\n" "$ac_res" >&6; } ac_fn_c_check_type () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { if (sizeof ($2)) return 0; @@ -2132,13 +2272,12 @@ if (sizeof ($2)) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main (void) +main () { if (sizeof (($2))) return 0; @@ -2146,19 +2285,18 @@ if (sizeof (($2))) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -else $as_nop +else eval "$3=yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type @@ -2170,12 +2308,11 @@ printf "%s\n" "$ac_res" >&6; } ac_fn_c_find_intX_t () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5 -printf %s "checking for int$2_t... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5 +$as_echo_n "checking for int$2_t... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else eval "$3=no" # Order is important - never check a type that is potentially smaller # than half of the expected target width. @@ -2186,7 +2323,7 @@ else $as_nop $ac_includes_default enum { N = $2 / 2 - 1 }; int -main (void) +main () { static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; test_array [0] = 0; @@ -2196,14 +2333,13 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default enum { N = $2 / 2 - 1 }; int -main (void) +main () { static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; @@ -2214,10 +2350,9 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -else $as_nop +else case $ac_type in #( int$2_t) : eval "$3=yes" ;; #( @@ -2225,20 +2360,19 @@ else $as_nop eval "$3=\$ac_type" ;; esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - if eval test \"x\$"$3"\" = x"no" -then : +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if eval test \"x\$"$3"\" = x"no"; then : -else $as_nop +else break fi done fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_find_intX_t @@ -2250,12 +2384,11 @@ printf "%s\n" "$ac_res" >&6; } ac_fn_c_find_uintX_t () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5 -printf %s "checking for uint$2_t... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5 +$as_echo_n "checking for uint$2_t... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else eval "$3=no" # Order is important - never check a type that is potentially smaller # than half of the expected target width. @@ -2265,7 +2398,7 @@ else $as_nop /* end confdefs.h. */ $ac_includes_default int -main (void) +main () { static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; test_array [0] = 0; @@ -2275,8 +2408,7 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : case $ac_type in #( uint$2_t) : eval "$3=yes" ;; #( @@ -2284,18 +2416,17 @@ then : eval "$3=\$ac_type" ;; esac fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - if eval test \"x\$"$3"\" = x"no" -then : +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if eval test \"x\$"$3"\" = x"no"; then : -else $as_nop +else break fi done fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_find_uintX_t @@ -2306,12 +2437,11 @@ printf "%s\n" "$ac_res" >&6; } ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case declares $2. @@ -2319,9 +2449,16 @@ else $as_nop #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. */ + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif -#include #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -2339,56 +2476,35 @@ choke me #endif int -main (void) +main () { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : eval "$3=yes" -else $as_nop +else eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func -ac_configure_args_raw= -for ac_arg -do - case $ac_arg in - *\'*) - ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append ac_configure_args_raw " '$ac_arg'" -done - -case $ac_configure_args_raw in - *$as_nl*) - ac_safe_unquote= ;; - *) - ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. - ac_unsafe_a="$ac_unsafe_z#~" - ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" - ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; -esac - cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by MET $as_me development, which was -generated by GNU Autoconf 2.71. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was - $ $0$ac_configure_args_raw + $ $0 $@ _ACEOF exec 5>>config.log @@ -2421,12 +2537,8 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - printf "%s\n" "PATH: $as_dir" + test -z "$as_dir" && as_dir=. + $as_echo "PATH: $as_dir" done IFS=$as_save_IFS @@ -2461,7 +2573,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -2496,13 +2608,11 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? - # Sanitize IFS. - IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - printf "%s\n" "## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -2513,8 +2623,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -2538,7 +2648,7 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ) echo - printf "%s\n" "## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -2546,14 +2656,14 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - printf "%s\n" "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - printf "%s\n" "## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -2561,15 +2671,15 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - printf "%s\n" "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - printf "%s\n" "## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -2577,8 +2687,8 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} echo fi test "$ac_signal" != 0 && - printf "%s\n" "$as_me: caught signal $ac_signal" - printf "%s\n" "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -2592,48 +2702,63 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -printf "%s\n" "/* confdefs.h */" > confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF -printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF -printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF -printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF -printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF -printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_files="$CONFIG_SITE" + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then - ac_site_files="$prefix/share/config.site $prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi - -for ac_site_file in $ac_site_files +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do - case $ac_site_file in #( - */*) : - ;; #( - *) : - ac_site_file=./$ac_site_file ;; -esac - if test -f "$ac_site_file" && test -r "$ac_site_file"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} + test "x$ac_site_file" = xNONE && continue + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -2643,728 +2768,123 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -printf "%s\n" "$as_me: loading cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -printf "%s\n" "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -# Test code for whether the C compiler supports C89 (global declarations) -ac_c_conftest_c89_globals=' -/* Does the compiler advertise C89 conformance? - Do not test the value of __STDC__, because some compilers set it to 0 - while being otherwise adequately conformant. */ -#if !defined __STDC__ -# error "Compiler does not advertise C89 conformance" -#endif +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ -struct buf { int x; }; -struct buf * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not \xHH hex character constants. - These do not provoke an error unfortunately, instead are silently treated - as an "x". The following induces an error, until -std is added to get - proper ANSI mode. Curiously \x00 != x always comes out true, for an - array size at least. It is necessary to write \x00 == 0 to get something - that is true only with -std. */ -int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) '\''x'\'' -int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), - int, int);' - -# Test code for whether the C compiler supports C89 (body of main). -ac_c_conftest_c89_main=' -ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); -' - -# Test code for whether the C compiler supports C99 (global declarations) -ac_c_conftest_c99_globals=' -// Does the compiler advertise C99 conformance? -#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L -# error "Compiler does not advertise C99 conformance" -#endif - -#include -extern int puts (const char *); -extern int printf (const char *, ...); -extern int dprintf (int, const char *, ...); -extern void *malloc (size_t); - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -// dprintf is used instead of fprintf to avoid needing to declare -// FILE and stderr. -#define debug(...) dprintf (2, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - #error "your preprocessor is broken" -#endif -#if BIG_OK -#else - #error "your preprocessor is broken" -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; - -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) -{ - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) - continue; - return 0; -} - -// Check varargs and va_copy. -static bool -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - - const char *str = ""; - int number = 0; - float fnumber = 0; - - while (*format) - { - switch (*format++) - { - case '\''s'\'': // string - str = va_arg (args_copy, const char *); - break; - case '\''d'\'': // int - number = va_arg (args_copy, int); - break; - case '\''f'\'': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); - - return *str && number && fnumber; -} -' - -# Test code for whether the C compiler supports C99 (body of main). -ac_c_conftest_c99_main=' - // Check bool. - _Bool success = false; - success |= (argc != 0); - - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - - // Check varargs. - success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); - test_varargs_macros (); - - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - - ni.number = 58; - - int dynamic_array[ni.number]; - dynamic_array[0] = argv[0][0]; - dynamic_array[ni.number - 1] = 543; - - // work around unused variable warnings - ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' - || dynamic_array[ni.number - 1] != 543); -' - -# Test code for whether the C compiler supports C11 (global declarations) -ac_c_conftest_c11_globals=' -// Does the compiler advertise C11 conformance? -#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L -# error "Compiler does not advertise C11 conformance" -#endif - -// Check _Alignas. -char _Alignas (double) aligned_as_double; -char _Alignas (0) no_special_alignment; -extern char aligned_as_int; -char _Alignas (0) _Alignas (int) aligned_as_int; - -// Check _Alignof. -enum -{ - int_alignment = _Alignof (int), - int_array_alignment = _Alignof (int[100]), - char_alignment = _Alignof (char) -}; -_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); - -// Check _Noreturn. -int _Noreturn does_not_return (void) { for (;;) continue; } - -// Check _Static_assert. -struct test_static_assert -{ - int x; - _Static_assert (sizeof (int) <= sizeof (long int), - "_Static_assert does not work in struct"); - long int y; -}; - -// Check UTF-8 literals. -#define u8 syntax error! -char const utf8_literal[] = u8"happens to be ASCII" "another string"; - -// Check duplicate typedefs. -typedef long *long_ptr; -typedef long int *long_ptr; -typedef long_ptr long_ptr; - -// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. -struct anonymous -{ - union { - struct { int i; int j; }; - struct { int k; long int l; } w; - }; - int m; -} v1; -' - -# Test code for whether the C compiler supports C11 (body of main). -ac_c_conftest_c11_main=' - _Static_assert ((offsetof (struct anonymous, i) - == offsetof (struct anonymous, w.k)), - "Anonymous union alignment botch"); - v1.i = 2; - v1.w.k = 5; - ok |= v1.i != 5; -' - -# Test code for whether the C compiler supports C11 (complete). -ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} -${ac_c_conftest_c99_globals} -${ac_c_conftest_c11_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - ${ac_c_conftest_c99_main} - ${ac_c_conftest_c11_main} - return ok; -} -" - -# Test code for whether the C compiler supports C99 (complete). -ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} -${ac_c_conftest_c99_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - ${ac_c_conftest_c99_main} - return ok; -} -" - -# Test code for whether the C compiler supports C89 (complete). -ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_c_conftest_c89_main} - return ok; -} -" - -# Test code for whether the C++ compiler supports C++98 (global declarations) -ac_cxx_conftest_cxx98_globals=' -// Does the compiler advertise C++98 conformance? -#if !defined __cplusplus || __cplusplus < 199711L -# error "Compiler does not advertise C++98 conformance" -#endif - -// These inclusions are to reject old compilers that -// lack the unsuffixed header files. -#include -#include - -// and are *not* freestanding headers in C++98. -extern void assert (int); -namespace std { - extern int strcmp (const char *, const char *); -} - -// Namespaces, exceptions, and templates were all added after "C++ 2.0". -using std::exception; -using std::strcmp; - -namespace { - -void test_exception_syntax() -{ - try { - throw "test"; - } catch (const char *s) { - // Extra parentheses suppress a warning when building autoconf itself, - // due to lint rules shared with more typical C programs. - assert (!(strcmp) (s, "test")); - } -} - -template struct test_template -{ - T const val; - explicit test_template(T t) : val(t) {} - template T add(U u) { return static_cast(u) + val; } -}; - -} // anonymous namespace -' - -# Test code for whether the C++ compiler supports C++98 (body of main) -ac_cxx_conftest_cxx98_main=' - assert (argc); - assert (! argv[0]); -{ - test_exception_syntax (); - test_template tt (2.0); - assert (tt.add (4) == 6.0); - assert (true && !false); -} -' - -# Test code for whether the C++ compiler supports C++11 (global declarations) -ac_cxx_conftest_cxx11_globals=' -// Does the compiler advertise C++ 2011 conformance? -#if !defined __cplusplus || __cplusplus < 201103L -# error "Compiler does not advertise C++11 conformance" -#endif - -namespace cxx11test -{ - constexpr int get_val() { return 20; } - - struct testinit - { - int i; - double d; - }; - - class delegate - { - public: - delegate(int n) : n(n) {} - delegate(): delegate(2354) {} - - virtual int getval() { return this->n; }; - protected: - int n; - }; - - class overridden : public delegate - { - public: - overridden(int n): delegate(n) {} - virtual int getval() override final { return this->n * 2; } - }; - - class nocopy - { - public: - nocopy(int i): i(i) {} - nocopy() = default; - nocopy(const nocopy&) = delete; - nocopy & operator=(const nocopy&) = delete; - private: - int i; - }; - - // for testing lambda expressions - template Ret eval(Fn f, Ret v) - { - return f(v); - } - - // for testing variadic templates and trailing return types - template auto sum(V first) -> V - { - return first; - } - template auto sum(V first, Args... rest) -> V - { - return first + sum(rest...); - } -} -' +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Test code for whether the C++ compiler supports C++11 (body of main) -ac_cxx_conftest_cxx11_main=' -{ - // Test auto and decltype - auto a1 = 6538; - auto a2 = 48573953.4; - auto a3 = "String literal"; - int total = 0; - for (auto i = a3; *i; ++i) { total += *i; } - decltype(a2) a4 = 34895.034; -} -{ - // Test constexpr - short sa[cxx11test::get_val()] = { 0 }; -} -{ - // Test initializer lists - cxx11test::testinit il = { 4323, 435234.23544 }; -} -{ - // Test range-based for - int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, - 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; - for (auto &x : array) { x += 23; } -} -{ - // Test lambda expressions - using cxx11test::eval; - assert (eval ([](int x) { return x*2; }, 21) == 42); - double d = 2.0; - assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0); - assert (d == 5.0); - assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0); - assert (d == 5.0); -} -{ - // Test use of variadic templates - using cxx11test::sum; - auto a = sum(1); - auto b = sum(1, 2); - auto c = sum(1.0, 2.0, 3.0); -} -{ - // Test constructor delegation - cxx11test::delegate d1; - cxx11test::delegate d2(); - cxx11test::delegate d3(45); -} -{ - // Test override and final - cxx11test::overridden o1(55464); -} -{ - // Test nullptr - char *c = nullptr; -} -{ - // Test template brackets - test_template<::test_template> v(test_template(12)); -} -{ - // Unicode literals - char const *utf8 = u8"UTF-8 string \u2500"; - char16_t const *utf16 = u"UTF-8 string \u2500"; - char32_t const *utf32 = U"UTF-32 string \u2500"; -} -' - -# Test code for whether the C compiler supports C++11 (complete). -ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals} -${ac_cxx_conftest_cxx11_globals} - -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_cxx_conftest_cxx98_main} - ${ac_cxx_conftest_cxx11_main} - return ok; -} -" +ac_config_headers="$ac_config_headers config.h" -# Test code for whether the C compiler supports C++98 (complete). -ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals} -int -main (int argc, char **argv) -{ - int ok = 0; - ${ac_cxx_conftest_cxx98_main} - return ok; -} -" -as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" -as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" -as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" -as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" -as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" -as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" -as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" -as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" -as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" - -# Auxiliary files required by this configure script. -ac_aux_files="config.guess config.sub compile missing install-sh" - -# Locations in which to look for auxiliary files. -ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." - -# Search for a directory containing all of the required auxiliary files, -# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. -# If we don't find one directory that contains all the files we need, -# we report the set of missing files from the *first* directory in -# $ac_aux_dir_candidates and give up. -ac_missing_aux_files="" -ac_first_candidate=: -printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in $ac_aux_dir_candidates -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - as_found=: +am__api_version='1.16' - printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 - ac_aux_dir_found=yes - ac_install_sh= - for ac_aux in $ac_aux_files - do - # As a special case, if "install-sh" is required, that requirement - # can be satisfied by any of "install-sh", "install.sh", or "shtool", - # and $ac_install_sh is set appropriately for whichever one is found. - if test x"$ac_aux" = x"install-sh" - then - if test -f "${as_dir}install-sh"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 - ac_install_sh="${as_dir}install-sh -c" - elif test -f "${as_dir}install.sh"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 - ac_install_sh="${as_dir}install.sh -c" - elif test -f "${as_dir}shtool"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 - ac_install_sh="${as_dir}shtool install -c" - else - ac_aux_dir_found=no - if $ac_first_candidate; then - ac_missing_aux_files="${ac_missing_aux_files} install-sh" - else - break - fi - fi - else - if test -f "${as_dir}${ac_aux}"; then - printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 - else - ac_aux_dir_found=no - if $ac_first_candidate; then - ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" - else - break - fi - fi - fi - done - if test "$ac_aux_dir_found" = yes; then - ac_aux_dir="$as_dir" +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" break fi - ac_first_candidate=false - - as_found=false done -IFS=$as_save_IFS -if $as_found -then : - -else $as_nop - as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +if test -z "$ac_aux_dir"; then + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi - # These three variables are undocumented and unsupported, # and are intended to be withdrawn in a future Autoconf release. # They can cause serious problems if a builder's source tree is in a directory # whose full name contains unusual characters. -if test -f "${ac_aux_dir}config.guess"; then - ac_config_guess="$SHELL ${ac_aux_dir}config.guess" -fi -if test -f "${ac_aux_dir}config.sub"; then - ac_config_sub="$SHELL ${ac_aux_dir}config.sub" -fi -if test -f "$ac_aux_dir/configure"; then - ac_configure="$SHELL ${ac_aux_dir}configure" -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' - and start over" "$LINENO" 5 -fi -## -------------------- ## -## Main body of script. ## -## -------------------- ## +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -ac_config_headers="$ac_config_headers config.h" - - -am__api_version='1.16' - - - - # Find a good install program. We prefer a C program (faster), +# Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: # SysV /etc/install, /usr/sbin/install @@ -3378,25 +2898,20 @@ am__api_version='1.16' # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -printf %s "checking for a BSD-compatible install... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test ${ac_cv_path_install+y} -then : - printf %s "(cached) " >&6 -else $as_nop +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - # Account for fact that we put trailing slashes in our PATH walk. -case $as_dir in #(( - ./ | /[cC]/* | \ + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; @@ -3406,13 +2921,13 @@ case $as_dir in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && - grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : elif test $ac_prog = install && - grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # program-specific install script used by HP pwplus--don't use. : else @@ -3420,12 +2935,12 @@ case $as_dir in #(( echo one > conftest.one echo two > conftest.two mkdir conftest.dir - if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && test -s conftest.one && test -s conftest.two && test -s conftest.dir/conftest.one && test -s conftest.dir/conftest.two then - ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" break 3 fi fi @@ -3441,7 +2956,7 @@ IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir fi - if test ${ac_cv_path_install+y}; then + if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. Don't cache a @@ -3451,8 +2966,8 @@ fi INSTALL=$ac_install_sh fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -printf "%s\n" "$INSTALL" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -3462,8 +2977,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -printf %s "checking whether build environment is sane... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -3517,8 +3032,8 @@ else as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } # If we didn't sleep, we still need to ensure time stamps of config.status and # generated files are strictly newer. am_sleep_pid= @@ -3537,23 +3052,26 @@ test "$program_suffix" != NONE && # Double any \ or $. # By default was `s,x,x', remove it if useless. ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` - +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # Expand $ac_aux_dir to an absolute path. am_aux_dir=`cd "$ac_aux_dir" && pwd` - - if test x"${MISSING+set}" != xset; then - MISSING="\${SHELL} '$am_aux_dir/missing'" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then am_missing_run="$MISSING " else am_missing_run= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh+set}" != xset; then @@ -3573,12 +3091,11 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_STRIP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -3586,15 +3103,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3605,11 +3118,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -printf "%s\n" "$STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -3618,12 +3131,11 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_STRIP+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -3631,15 +3143,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3650,11 +3158,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -printf "%s\n" "$ac_ct_STRIP" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -3662,8 +3170,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -3675,31 +3183,25 @@ fi fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 -printf %s "checking for a race-free mkdir -p... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test ${ac_cv_path_mkdir+y} -then : - printf %s "(cached) " >&6 -else $as_nop + if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 +else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue - case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir ('*'coreutils) '* | \ - 'BusyBox '* | \ + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext break 3;; esac done @@ -3710,7 +3212,7 @@ IFS=$as_save_IFS fi test -d ./--version && rmdir ./--version - if test ${ac_cv_path_mkdir+y}; then + if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else # As a last resort, use the slow shell script. Don't cache a @@ -3720,19 +3222,18 @@ fi MKDIR_P="$ac_install_sh -d" fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -printf "%s\n" "$MKDIR_P" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_AWK+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -3740,15 +3241,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3759,25 +3256,24 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -printf "%s\n" "$AWK" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi test -n "$AWK" && break done -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} -ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval test \${ac_cv_prog_make_${ac_make}_set+y} -then : - printf %s "(cached) " >&6 -else $as_nop +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + $as_echo_n "(cached) " >&6 +else cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @@ -3793,12 +3289,12 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } SET_MAKE= else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -3812,8 +3308,7 @@ fi rmdir .tst 2>/dev/null # Check whether --enable-silent-rules was given. -if test ${enable_silent_rules+y} -then : +if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; fi @@ -3823,13 +3318,12 @@ case $enable_silent_rules in # ((( *) AM_DEFAULT_VERBOSITY=1;; esac am_make=${MAKE-make} -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -printf %s "checking whether $am_make supports nested variables... " >&6; } -if test ${am_cv_make_support_nested_variables+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if printf "%s\n" 'TRUE=$(BAR$(V)) +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -3841,8 +3335,8 @@ else am_cv_make_support_nested_variables=no fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -3877,10 +3371,14 @@ fi VERSION='development' -printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF -printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF # Some tools Automake needs. @@ -3920,20 +3418,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' -# Variables for tags utilities; see am/tags.am -if test -z "$CTAGS"; then - CTAGS=ctags -fi - -if test -z "$ETAGS"; then - ETAGS=etags -fi - -if test -z "$CSCOPE"; then - CSCOPE=cscope -fi - - # POSIX will say in a future version that running "rm -f" with no argument # is OK; and we want to be able to make that assumption in our Makefile @@ -3980,24 +3464,12 @@ fi # OpenMP -if test -e penmp || test -e mp; then - as_fn_error $? "AC_OPENMP clobbers files named 'mp' and 'penmp'. Aborting configure because one of these files already exists." "$LINENO" 5 -fi - - - - - - - - - DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 -printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } cat > confinc.mk << 'END' am__doit: @echo this is the am__doit target >confinc.out @@ -4033,12 +3505,11 @@ esac fi done rm -f confinc.* confmf.* -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 -printf "%s\n" "${_am_result}" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. -if test ${enable_dependency_tracking+y} -then : +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi @@ -4064,12 +3535,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -4077,15 +3547,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4096,11 +3562,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4109,12 +3575,11 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -4122,15 +3587,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4141,11 +3602,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -4153,8 +3614,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -4167,12 +3628,11 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -4180,15 +3640,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4199,11 +3655,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4212,12 +3668,11 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -4226,19 +3681,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4254,18 +3705,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4276,12 +3727,11 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -4289,15 +3739,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4308,11 +3754,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4325,12 +3771,11 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -4338,15 +3783,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4357,11 +3798,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4373,8 +3814,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -4382,129 +3823,25 @@ esac fi fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. -set dummy ${ac_tool_prefix}clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "clang", so it can be a program name with args. -set dummy clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -fi - - -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion -version; do +for ac_option in --version -v -V -qversion; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -4514,7 +3851,7 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -4522,7 +3859,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; @@ -4534,9 +3871,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -printf %s "checking whether the C compiler works... " >&6; } -ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -4557,12 +3894,11 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -4579,7 +3915,7 @@ do # certainly right. break;; *.* ) - if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -4595,46 +3931,44 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else $as_nop +else ac_file='' fi -if test -z "$ac_file" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -printf "%s\n" "$as_me: failed program was:" >&5 +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -printf %s "checking for C compiler default output file name... " >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -printf "%s\n" "$ac_file" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -printf %s "checking for suffix of executables... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -4648,15 +3982,15 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else $as_nop - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -printf "%s\n" "$ac_cv_exeext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -4665,7 +3999,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -4677,8 +4011,8 @@ _ACEOF ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -printf %s "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -4686,10 +4020,10 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -4697,40 +4031,39 @@ printf "%s\n" "$ac_try_echo"; } >&5 *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "cannot run C compiled programs. + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details" "$LINENO" 5; } fi fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -printf "%s\n" "$cross_compiling" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -printf %s "checking for suffix of object files... " >&6; } -if test ${ac_cv_objext+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } +if ${ac_cv_objext+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; @@ -4744,12 +4077,11 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -then : + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -4758,32 +4090,31 @@ then : break;; esac done -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 +else + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -printf "%s\n" "$ac_cv_objext" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 -printf %s "checking whether the compiler supports GNU C... " >&6; } -if test ${ac_cv_c_compiler_gnu+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { #ifndef __GNUC__ choke me @@ -4793,33 +4124,29 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes -else $as_nop +else ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } -ac_compiler_gnu=$ac_cv_c_compiler_gnu - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+y} +ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -printf %s "checking whether $CC accepts -g... " >&6; } -if test ${ac_cv_prog_cc_g+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -4828,60 +4155,57 @@ else $as_nop /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else $as_nop +else CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -else $as_nop +else ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -printf "%s\n" "$ac_cv_prog_cc_g" >&6; } -if test $ac_test_CFLAGS; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -4896,144 +4220,94 @@ else CFLAGS= fi fi -ac_prog_cc_stdc=no -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 -printf %s "checking for $CC option to enable C11 features... " >&6; } -if test ${ac_cv_prog_cc_c11+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c11=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_c_conftest_c11_program -_ACEOF -for ac_arg in '' -std=gnu11 -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c11=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c11" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} -if test "x$ac_cv_prog_cc_c11" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 -printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 -fi -fi -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 -printf %s "checking for $CC option to enable C99 features... " >&6; } -if test ${ac_cv_prog_cc_c99+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_c_conftest_c99_program -_ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c99=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c99" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -if test "x$ac_cv_prog_cc_c99" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 -fi -fi -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 -printf %s "checking for $CC option to enable C89 features... " >&6; } -if test ${ac_cv_prog_cc_c89+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_c_conftest_c89_program +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext conftest.beam +rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC -fi -if test "x$ac_cv_prog_cc_c89" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + fi ac_ext=c @@ -5042,23 +4316,21 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - - ac_ext=c +ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -printf %s "checking whether $CC understands -c and -o together... " >&6; } -if test ${am_cv_prog_cc_c_o+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; @@ -5086,8 +4358,8 @@ _ACEOF rm -f core conftest* unset am_i fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } if test "$am_cv_prog_cc_c_o" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. @@ -5105,12 +4377,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CC" am_compiler_list= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -printf %s "checking dependency style of $depcc... " >&6; } -if test ${am_cv_CC_dependencies_compiler_type+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -5217,8 +4488,8 @@ else fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -5233,77 +4504,69 @@ fi -# Check whether --enable-openmp was given. -if test ${enable_openmp+y} -then : + + OPENMP_CFLAGS= + # Check whether --enable-openmp was given. +if test "${enable_openmp+set}" = set; then : enableval=$enable_openmp; fi - OPENMP_CFLAGS= if test "$enable_openmp" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to support OpenMP" >&5 -printf %s "checking for $CC option to support OpenMP... " >&6; } -if test ${ac_cv_prog_c_openmp+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_c_openmp='not found' - for ac_option in '' -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp -homp \ - -Popenmp --openmp; do - - ac_save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $ac_option" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to support OpenMP" >&5 +$as_echo_n "checking for $CC option to support OpenMP... " >&6; } +if ${ac_cv_prog_c_openmp+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef _OPENMP -#error "OpenMP not supported" + choke me #endif #include -int main (void) { return omp_get_num_threads (); } +int main () { return omp_get_num_threads (); } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_prog_c_openmp='none needed' +else + ac_cv_prog_c_openmp='unsupported' + for ac_option in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp -homp \ + -Popenmp --openmp; do + ac_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $ac_option" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef _OPENMP -#error "OpenMP not supported" + choke me #endif #include -int main (void) { return omp_get_num_threads (); } +int main () { return omp_get_num_threads (); } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_prog_c_openmp=$ac_option -else $as_nop - ac_cv_prog_c_openmp='unsupported' fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext + CFLAGS=$ac_save_CFLAGS + if test "$ac_cv_prog_c_openmp" != unsupported; then + break + fi + done fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - CFLAGS=$ac_save_CFLAGS - - if test "$ac_cv_prog_c_openmp" != 'not found'; then - break - fi - done - if test "$ac_cv_prog_c_openmp" = 'not found'; then - ac_cv_prog_c_openmp='unsupported' - elif test "$ac_cv_prog_c_openmp" = ''; then - ac_cv_prog_c_openmp='none needed' - fi - rm -f penmp mp +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_c_openmp" >&5 -printf "%s\n" "$ac_cv_prog_c_openmp" >&6; } - if test "$ac_cv_prog_c_openmp" != 'unsupported' && \ - test "$ac_cv_prog_c_openmp" != 'none needed'; then - OPENMP_CFLAGS="$ac_cv_prog_c_openmp" - fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_c_openmp" >&5 +$as_echo "$ac_cv_prog_c_openmp" >&6; } + case $ac_cv_prog_c_openmp in #( + "none needed" | unsupported) + ;; #( + *) + OPENMP_CFLAGS=$ac_cv_prog_c_openmp ;; + esac fi @@ -5599,8 +4862,8 @@ else BUFRLIB_NAME_SET_FALSE= fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: BUFRLIB_NAME will be set" >&5 -printf "%s\n" "$as_me: BUFRLIB_NAME will be set" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: BUFRLIB_NAME will be set" >&5 +$as_echo "$as_me: BUFRLIB_NAME will be set" >&6;} # # Look for the HDF library. @@ -5737,13 +5000,12 @@ fi # BLOCK4 # Check whether --enable-block4 was given. -if test ${enable_block4+y} -then : +if test "${enable_block4+set}" = set; then : enableval=$enable_block4; case "${enableval}" in yes | no ) ENABLE_BLOCK4="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-block4" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_BLOCK4="yes" fi @@ -5760,23 +5022,22 @@ fi if test "x$ENABLE_BLOCK4" = "xyes"; then CPPFLAGS="${CPPFLAGS} -DBLOCK4" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -DBLOCK4 will be used in the compiles" >&5 -printf "%s\n" "$as_me: -DBLOCK4 will be used in the compiles" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: -DBLOCK4 will be used in the compiles" >&5 +$as_echo "$as_me: -DBLOCK4 will be used in the compiles" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -DBLOCK4 will not be used in the compiles" >&5 -printf "%s\n" "$as_me: -DBLOCK4 will not be used in the compiles" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: -DBLOCK4 will not be used in the compiles" >&5 +$as_echo "$as_me: -DBLOCK4 will not be used in the compiles" >&6;} fi # static linking # Check whether --enable-static_linking was given. -if test ${enable_static_linking+y} -then : +if test "${enable_static_linking+set}" = set; then : enableval=$enable_static_linking; case "${enableval}" in yes | no ) ENABLE_STATIC_LINKING="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --enable-static_linking" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_STATIC_LINKING="no" fi @@ -5793,23 +5054,22 @@ fi if test "x$ENABLE_STATIC_LINKING" = "xyes"; then LDFLAGS="${LDFLAGS} -static" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Static linking will be used in the compiles" >&5 -printf "%s\n" "$as_me: Static linking will be used in the compiles" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Static linking will be used in the compiles" >&5 +$as_echo "$as_me: Static linking will be used in the compiles" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Dynamic linking will not be used in the compiles" >&5 -printf "%s\n" "$as_me: Dynamic linking will not be used in the compiles" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: Dynamic linking will not be used in the compiles" >&5 +$as_echo "$as_me: Dynamic linking will not be used in the compiles" >&6;} fi # ascii2nc # Check whether --enable-ascii2nc was given. -if test ${enable_ascii2nc+y} -then : +if test "${enable_ascii2nc+set}" = set; then : enableval=$enable_ascii2nc; case "${enableval}" in yes | no ) ENABLE_ASCII2NC="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-ascii2nc" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_ASCII2NC="yes" fi @@ -5826,25 +5086,24 @@ fi if test "x$ENABLE_ASCII2NC" = "xyes"; then -printf "%s\n" "#define ENABLE_ASCII2NC /**/" >>confdefs.h +$as_echo "#define ENABLE_ASCII2NC /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ascii2nc will be compiled" >&5 -printf "%s\n" "$as_me: ascii2nc will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: ascii2nc will be compiled" >&5 +$as_echo "$as_me: ascii2nc will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ascii2nc will not be compiled" >&5 -printf "%s\n" "$as_me: ascii2nc will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: ascii2nc will not be compiled" >&5 +$as_echo "$as_me: ascii2nc will not be compiled" >&6;} fi # lidar2nc # Check whether --enable-lidar2nc was given. -if test ${enable_lidar2nc+y} -then : +if test "${enable_lidar2nc+set}" = set; then : enableval=$enable_lidar2nc; case "${enableval}" in yes | no ) ENABLE_LIDAR2NC="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-lidar2nc" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_LIDAR2NC="no" fi @@ -5861,25 +5120,24 @@ fi if test "x$ENABLE_LIDAR2NC" = "xyes"; then -printf "%s\n" "#define ENABLE_LIDAR2NC /**/" >>confdefs.h +$as_echo "#define ENABLE_LIDAR2NC /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: lidar2nc will be compiled" >&5 -printf "%s\n" "$as_me: lidar2nc will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: lidar2nc will be compiled" >&5 +$as_echo "$as_me: lidar2nc will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: lidar2nc will not be compiled" >&5 -printf "%s\n" "$as_me: lidar2nc will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: lidar2nc will not be compiled" >&5 +$as_echo "$as_me: lidar2nc will not be compiled" >&6;} fi # ensemble_stat # Check whether --enable-ensemble_stat was given. -if test ${enable_ensemble_stat+y} -then : +if test "${enable_ensemble_stat+set}" = set; then : enableval=$enable_ensemble_stat; case "${enableval}" in yes | no ) ENABLE_ENSEMBLE_STAT="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-ensemble_stat" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_ENSEMBLE_STAT="yes" fi @@ -5896,25 +5154,24 @@ fi if test "x$ENABLE_ENSEMBLE_STAT" = "xyes"; then -printf "%s\n" "#define ENABLE_ENSEMBLE_STAT /**/" >>confdefs.h +$as_echo "#define ENABLE_ENSEMBLE_STAT /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ensemble_stat will be compiled" >&5 -printf "%s\n" "$as_me: ensemble_stat will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: ensemble_stat will be compiled" >&5 +$as_echo "$as_me: ensemble_stat will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ensemble_stat will not be compiled" >&5 -printf "%s\n" "$as_me: ensemble_stat will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: ensemble_stat will not be compiled" >&5 +$as_echo "$as_me: ensemble_stat will not be compiled" >&6;} fi # gen_ens_prod # Check whether --enable-gen_ens_prod was given. -if test ${enable_gen_ens_prod+y} -then : +if test "${enable_gen_ens_prod+set}" = set; then : enableval=$enable_gen_ens_prod; case "${enableval}" in yes | no ) ENABLE_GEN_ENS_PROD="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-gen_ens_prod" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_GEN_ENS_PROD="yes" fi @@ -5931,26 +5188,25 @@ fi if test "x$ENABLE_GEN_ENS_PROD" = "xyes"; then -printf "%s\n" "#define ENABLE_GEN_ENS_PROD /**/" >>confdefs.h +$as_echo "#define ENABLE_GEN_ENS_PROD /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: gen_ens_prod will be compiled" >&5 -printf "%s\n" "$as_me: gen_ens_prod will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: gen_ens_prod will be compiled" >&5 +$as_echo "$as_me: gen_ens_prod will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: gen_ens_prod will not be compiled" >&5 -printf "%s\n" "$as_me: gen_ens_prod will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: gen_ens_prod will not be compiled" >&5 +$as_echo "$as_me: gen_ens_prod will not be compiled" >&6;} fi # gen_vx_mask # Check whether --enable-gen_vx_mask was given. -if test ${enable_gen_vx_mask+y} -then : +if test "${enable_gen_vx_mask+set}" = set; then : enableval=$enable_gen_vx_mask; case "${enableval}" in yes | no ) ENABLE_GEN_VX_MASK="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-gen_vx_mask" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_GEN_VX_MASK="yes" fi @@ -5967,26 +5223,25 @@ fi if test "x$ENABLE_GEN_VX_MASK" = "xyes"; then -printf "%s\n" "#define ENABLE_GEN_VX_MASK /**/" >>confdefs.h +$as_echo "#define ENABLE_GEN_VX_MASK /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: gen_vx_mask will be compiled" >&5 -printf "%s\n" "$as_me: gen_vx_mask will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: gen_vx_mask will be compiled" >&5 +$as_echo "$as_me: gen_vx_mask will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: gen_vx_mask will not be compiled" >&5 -printf "%s\n" "$as_me: gen_vx_mask will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: gen_vx_mask will not be compiled" >&5 +$as_echo "$as_me: gen_vx_mask will not be compiled" >&6;} fi # gis_utils # Check whether --enable-gis_utils was given. -if test ${enable_gis_utils+y} -then : +if test "${enable_gis_utils+set}" = set; then : enableval=$enable_gis_utils; case "${enableval}" in yes | no ) ENABLE_GIS_UTILS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-gis_utils" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_GIS_UTILS="yes" fi @@ -6003,26 +5258,25 @@ fi if test "x$ENABLE_GIS_UTILS" = "xyes"; then -printf "%s\n" "#define ENABLE_GIS_UTILS /**/" >>confdefs.h +$as_echo "#define ENABLE_GIS_UTILS /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: gis_utils will be compiled" >&5 -printf "%s\n" "$as_me: gis_utils will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: gis_utils will be compiled" >&5 +$as_echo "$as_me: gis_utils will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: gis_utils will not be compiled" >&5 -printf "%s\n" "$as_me: gis_utils will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: gis_utils will not be compiled" >&5 +$as_echo "$as_me: gis_utils will not be compiled" >&6;} fi # grid_stat # Check whether --enable-grid_stat was given. -if test ${enable_grid_stat+y} -then : +if test "${enable_grid_stat+set}" = set; then : enableval=$enable_grid_stat; case "${enableval}" in yes | no ) ENABLE_GRID_STAT="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-grid_stat" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_GRID_STAT="yes" fi @@ -6039,25 +5293,24 @@ fi if test "x$ENABLE_GRID_STAT" = "xyes"; then -printf "%s\n" "#define ENABLE_GRID_STAT /**/" >>confdefs.h +$as_echo "#define ENABLE_GRID_STAT /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: grid_stat will be compiled" >&5 -printf "%s\n" "$as_me: grid_stat will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: grid_stat will be compiled" >&5 +$as_echo "$as_me: grid_stat will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: grid_stat will not be compiled" >&5 -printf "%s\n" "$as_me: grid_stat will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: grid_stat will not be compiled" >&5 +$as_echo "$as_me: grid_stat will not be compiled" >&6;} fi # ioda2nc # Check whether --enable-ioda2nc was given. -if test ${enable_ioda2nc+y} -then : +if test "${enable_ioda2nc+set}" = set; then : enableval=$enable_ioda2nc; case "${enableval}" in yes | no ) ENABLE_IODA2NC="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-ioda2nc" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_IODA2NC="yes" fi @@ -6074,25 +5327,24 @@ fi if test "x$ENABLE_IODA2NC" = "xyes"; then -printf "%s\n" "#define ENABLE_IODA2NC /**/" >>confdefs.h +$as_echo "#define ENABLE_IODA2NC /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ioda2nc will be compiled" >&5 -printf "%s\n" "$as_me: ioda2nc will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: ioda2nc will be compiled" >&5 +$as_echo "$as_me: ioda2nc will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: ioda2nc will not be compiled" >&5 -printf "%s\n" "$as_me: ioda2nc will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: ioda2nc will not be compiled" >&5 +$as_echo "$as_me: ioda2nc will not be compiled" >&6;} fi # madis2nc # Check whether --enable-madis2nc was given. -if test ${enable_madis2nc+y} -then : +if test "${enable_madis2nc+set}" = set; then : enableval=$enable_madis2nc; case "${enableval}" in yes | no ) ENABLE_MADIS2NC="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-madis2nc" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_MADIS2NC="yes" fi @@ -6109,25 +5361,24 @@ fi if test "x$ENABLE_MADIS2NC" = "xyes"; then -printf "%s\n" "#define ENABLE_MADIS2NC /**/" >>confdefs.h +$as_echo "#define ENABLE_MADIS2NC /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: madis2nc will be compiled" >&5 -printf "%s\n" "$as_me: madis2nc will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: madis2nc will be compiled" >&5 +$as_echo "$as_me: madis2nc will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: madis2nc will not be compiled" >&5 -printf "%s\n" "$as_me: madis2nc will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: madis2nc will not be compiled" >&5 +$as_echo "$as_me: madis2nc will not be compiled" >&6;} fi # mode # Check whether --enable-mode was given. -if test ${enable_mode+y} -then : +if test "${enable_mode+set}" = set; then : enableval=$enable_mode; case "${enableval}" in yes | no ) ENABLE_MODE="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-mode" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_MODE="yes" fi @@ -6144,25 +5395,24 @@ fi if test "x$ENABLE_MODE" = "xyes"; then -printf "%s\n" "#define ENABLE_MODE /**/" >>confdefs.h +$as_echo "#define ENABLE_MODE /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: mode will be compiled" >&5 -printf "%s\n" "$as_me: mode will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: mode will be compiled" >&5 +$as_echo "$as_me: mode will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: mode will not be compiled" >&5 -printf "%s\n" "$as_me: mode will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: mode will not be compiled" >&5 +$as_echo "$as_me: mode will not be compiled" >&6;} fi # mode_analysis # Check whether --enable-mode_analysis was given. -if test ${enable_mode_analysis+y} -then : +if test "${enable_mode_analysis+set}" = set; then : enableval=$enable_mode_analysis; case "${enableval}" in yes | no ) ENABLE_MODE_ANALYSIS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-mode_analysis" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_MODE_ANALYSIS="yes" fi @@ -6179,25 +5429,24 @@ fi if test "x$ENABLE_MODE_ANALYSIS" = "xyes"; then -printf "%s\n" "#define ENABLE_MODE_ANALYSIS /**/" >>confdefs.h +$as_echo "#define ENABLE_MODE_ANALYSIS /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: mode_analysis will be compiled" >&5 -printf "%s\n" "$as_me: mode_analysis will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: mode_analysis will be compiled" >&5 +$as_echo "$as_me: mode_analysis will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: mode_analysis will not be compiled" >&5 -printf "%s\n" "$as_me: mode_analysis will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: mode_analysis will not be compiled" >&5 +$as_echo "$as_me: mode_analysis will not be compiled" >&6;} fi # pb2nc # Check whether --enable-pb2nc was given. -if test ${enable_pb2nc+y} -then : +if test "${enable_pb2nc+set}" = set; then : enableval=$enable_pb2nc; case "${enableval}" in yes | no ) ENABLE_PB2NC="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-pb2nc" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_PB2NC="yes" fi @@ -6214,25 +5463,24 @@ fi if test "x$ENABLE_PB2NC" = "xyes"; then -printf "%s\n" "#define ENABLE_PB2NC /**/" >>confdefs.h +$as_echo "#define ENABLE_PB2NC /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pb2nc will be compiled" >&5 -printf "%s\n" "$as_me: pb2nc will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: pb2nc will be compiled" >&5 +$as_echo "$as_me: pb2nc will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pb2nc will not be compiled" >&5 -printf "%s\n" "$as_me: pb2nc will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: pb2nc will not be compiled" >&5 +$as_echo "$as_me: pb2nc will not be compiled" >&6;} fi # pcp_combine # Check whether --enable-pcp_combine was given. -if test ${enable_pcp_combine+y} -then : +if test "${enable_pcp_combine+set}" = set; then : enableval=$enable_pcp_combine; case "${enableval}" in yes | no ) ENABLE_PCP_COMBINE="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-pcp_combine" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_PCP_COMBINE="yes" fi @@ -6249,25 +5497,24 @@ fi if test "x$ENABLE_PCP_COMBINE" = "xyes"; then -printf "%s\n" "#define ENABLE_PCP_COMBINE /**/" >>confdefs.h +$as_echo "#define ENABLE_PCP_COMBINE /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pcp_combine will be compiled" >&5 -printf "%s\n" "$as_me: pcp_combine will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: pcp_combine will be compiled" >&5 +$as_echo "$as_me: pcp_combine will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pcp_combine will not be compiled" >&5 -printf "%s\n" "$as_me: pcp_combine will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: pcp_combine will not be compiled" >&5 +$as_echo "$as_me: pcp_combine will not be compiled" >&6;} fi # plot_data_plane # Check whether --enable-plot_data_plane was given. -if test ${enable_plot_data_plane+y} -then : +if test "${enable_plot_data_plane+set}" = set; then : enableval=$enable_plot_data_plane; case "${enableval}" in yes | no ) ENABLE_PLOT_DATA_PLANE="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-plot_data_plane" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_PLOT_DATA_PLANE="yes" fi @@ -6284,25 +5531,24 @@ fi if test "x$ENABLE_PLOT_DATA_PLANE" = "xyes"; then -printf "%s\n" "#define ENABLE_PLOT_DATA_PLANE /**/" >>confdefs.h +$as_echo "#define ENABLE_PLOT_DATA_PLANE /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: plot_data_plane will be compiled" >&5 -printf "%s\n" "$as_me: plot_data_plane will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: plot_data_plane will be compiled" >&5 +$as_echo "$as_me: plot_data_plane will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: plot_data_plane will not be compiled" >&5 -printf "%s\n" "$as_me: plot_data_plane will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: plot_data_plane will not be compiled" >&5 +$as_echo "$as_me: plot_data_plane will not be compiled" >&6;} fi # regrid_data_plane # Check whether --enable-regrid_data_plane was given. -if test ${enable_regrid_data_plane+y} -then : +if test "${enable_regrid_data_plane+set}" = set; then : enableval=$enable_regrid_data_plane; case "${enableval}" in yes | no ) ENABLE_REGRID_DATA_PLANE="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-regrid_data_plane" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_REGRID_DATA_PLANE="yes" fi @@ -6319,25 +5565,24 @@ fi if test "x$ENABLE_REGRID_DATA_PLANE" = "xyes"; then -printf "%s\n" "#define ENABLE_REGRID_DATA_PLANE /**/" >>confdefs.h +$as_echo "#define ENABLE_REGRID_DATA_PLANE /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: regrid_data_plane will be compiled" >&5 -printf "%s\n" "$as_me: regrid_data_plane will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: regrid_data_plane will be compiled" >&5 +$as_echo "$as_me: regrid_data_plane will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: regrid_data_plane will not be compiled" >&5 -printf "%s\n" "$as_me: regrid_data_plane will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: regrid_data_plane will not be compiled" >&5 +$as_echo "$as_me: regrid_data_plane will not be compiled" >&6;} fi # point2grid # Check whether --enable-point2grid was given. -if test ${enable_point2grid+y} -then : +if test "${enable_point2grid+set}" = set; then : enableval=$enable_point2grid; case "${enableval}" in yes | no ) ENABLE_POINT2GRID="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-point2grid" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_POINT2GRID="yes" fi @@ -6354,25 +5599,24 @@ fi if test "x$ENABLE_POINT2GRID" = "xyes"; then -printf "%s\n" "#define ENABLE_POINT2GRID /**/" >>confdefs.h +$as_echo "#define ENABLE_POINT2GRID /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: point2grid will be compiled" >&5 -printf "%s\n" "$as_me: point2grid will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: point2grid will be compiled" >&5 +$as_echo "$as_me: point2grid will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: point2grid will not be compiled" >&5 -printf "%s\n" "$as_me: point2grid will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: point2grid will not be compiled" >&5 +$as_echo "$as_me: point2grid will not be compiled" >&6;} fi # shift_data_plane # Check whether --enable-shift_data_plane was given. -if test ${enable_shift_data_plane+y} -then : +if test "${enable_shift_data_plane+set}" = set; then : enableval=$enable_shift_data_plane; case "${enableval}" in yes | no ) ENABLE_SHIFT_DATA_PLANE="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-shift_data_plane" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_SHIFT_DATA_PLANE="yes" fi @@ -6389,25 +5633,24 @@ fi if test "x$ENABLE_SHIFT_DATA_PLANE" = "xyes"; then -printf "%s\n" "#define ENABLE_SHIFT_DATA_PLANE /**/" >>confdefs.h +$as_echo "#define ENABLE_SHIFT_DATA_PLANE /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: shift_data_plane will be compiled" >&5 -printf "%s\n" "$as_me: shift_data_plane will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: shift_data_plane will be compiled" >&5 +$as_echo "$as_me: shift_data_plane will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: shift_data_plane will not be compiled" >&5 -printf "%s\n" "$as_me: shift_data_plane will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: shift_data_plane will not be compiled" >&5 +$as_echo "$as_me: shift_data_plane will not be compiled" >&6;} fi # plot_point_obs # Check whether --enable-plot_point_obs was given. -if test ${enable_plot_point_obs+y} -then : +if test "${enable_plot_point_obs+set}" = set; then : enableval=$enable_plot_point_obs; case "${enableval}" in yes | no ) ENABLE_PLOT_POINT_OBS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-plot_point_obs" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_PLOT_POINT_OBS="yes" fi @@ -6424,25 +5667,24 @@ fi if test "x$ENABLE_PLOT_POINT_OBS" = "xyes"; then -printf "%s\n" "#define ENABLE_PLOT_POINT_OBS /**/" >>confdefs.h +$as_echo "#define ENABLE_PLOT_POINT_OBS /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: plot_point_obs will be compiled" >&5 -printf "%s\n" "$as_me: plot_point_obs will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: plot_point_obs will be compiled" >&5 +$as_echo "$as_me: plot_point_obs will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: plot_point_obs will not be compiled" >&5 -printf "%s\n" "$as_me: plot_point_obs will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: plot_point_obs will not be compiled" >&5 +$as_echo "$as_me: plot_point_obs will not be compiled" >&6;} fi # point_stat # Check whether --enable-point_stat was given. -if test ${enable_point_stat+y} -then : +if test "${enable_point_stat+set}" = set; then : enableval=$enable_point_stat; case "${enableval}" in yes | no ) ENABLE_POINT_STAT="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-point_stat" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_POINT_STAT="yes" fi @@ -6459,25 +5701,24 @@ fi if test "x$ENABLE_POINT_STAT" = "xyes"; then -printf "%s\n" "#define ENABLE_POINT_STAT /**/" >>confdefs.h +$as_echo "#define ENABLE_POINT_STAT /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: point_stat will be compiled" >&5 -printf "%s\n" "$as_me: point_stat will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: point_stat will be compiled" >&5 +$as_echo "$as_me: point_stat will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: point_stat will not be compiled" >&5 -printf "%s\n" "$as_me: point_stat will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: point_stat will not be compiled" >&5 +$as_echo "$as_me: point_stat will not be compiled" >&6;} fi # stat_analysis # Check whether --enable-stat_analysis was given. -if test ${enable_stat_analysis+y} -then : +if test "${enable_stat_analysis+set}" = set; then : enableval=$enable_stat_analysis; case "${enableval}" in yes | no ) ENABLE_STAT_ANALYSIS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-stat_analysis" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_STAT_ANALYSIS="yes" fi @@ -6494,25 +5735,24 @@ fi if test "x$ENABLE_STAT_ANALYSIS" = "xyes"; then -printf "%s\n" "#define ENABLE_STAT_ANALYSIS /**/" >>confdefs.h +$as_echo "#define ENABLE_STAT_ANALYSIS /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: stat_analysis will be compiled" >&5 -printf "%s\n" "$as_me: stat_analysis will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: stat_analysis will be compiled" >&5 +$as_echo "$as_me: stat_analysis will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: stat_analysis will not be compiled" >&5 -printf "%s\n" "$as_me: stat_analysis will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: stat_analysis will not be compiled" >&5 +$as_echo "$as_me: stat_analysis will not be compiled" >&6;} fi # wavelet_stat # Check whether --enable-wavelet_stat was given. -if test ${enable_wavelet_stat+y} -then : +if test "${enable_wavelet_stat+set}" = set; then : enableval=$enable_wavelet_stat; case "${enableval}" in yes | no ) ENABLE_WAVELET_STAT="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-wavelet_stat" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_WAVELET_STAT="yes" fi @@ -6529,25 +5769,24 @@ fi if test "x$ENABLE_WAVELET_STAT" = "xyes"; then -printf "%s\n" "#define ENABLE_WAVELET_STAT /**/" >>confdefs.h +$as_echo "#define ENABLE_WAVELET_STAT /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: wavelet_stat will be compiled" >&5 -printf "%s\n" "$as_me: wavelet_stat will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: wavelet_stat will be compiled" >&5 +$as_echo "$as_me: wavelet_stat will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: wavelet_stat will not be compiled" >&5 -printf "%s\n" "$as_me: wavelet_stat will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: wavelet_stat will not be compiled" >&5 +$as_echo "$as_me: wavelet_stat will not be compiled" >&6;} fi # series_analysis # Check whether --enable-series_analysis was given. -if test ${enable_series_analysis+y} -then : +if test "${enable_series_analysis+set}" = set; then : enableval=$enable_series_analysis; case "${enableval}" in yes | no ) ENABLE_SERIES_ANALYSIS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-series_analysis" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_SERIES_ANALYSIS="yes" fi @@ -6564,25 +5803,24 @@ fi if test "x$ENABLE_SERIES_ANALYSIS" = "xyes"; then -printf "%s\n" "#define ENABLE_SERIES_ANALYSIS /**/" >>confdefs.h +$as_echo "#define ENABLE_SERIES_ANALYSIS /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: series_analysis will be compiled" >&5 -printf "%s\n" "$as_me: series_analysis will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: series_analysis will be compiled" >&5 +$as_echo "$as_me: series_analysis will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: series_analysis will not be compiled" >&5 -printf "%s\n" "$as_me: series_analysis will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: series_analysis will not be compiled" >&5 +$as_echo "$as_me: series_analysis will not be compiled" >&6;} fi # wwmca # Check whether --enable-wwmca was given. -if test ${enable_wwmca+y} -then : +if test "${enable_wwmca+set}" = set; then : enableval=$enable_wwmca; case "${enableval}" in yes | no ) ENABLE_WWMCA="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-wwmca" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_WWMCA="yes" fi @@ -6599,25 +5837,24 @@ fi if test "x$ENABLE_WWMCA" = "xyes"; then -printf "%s\n" "#define ENABLE_WWMCA /**/" >>confdefs.h +$as_echo "#define ENABLE_WWMCA /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: wwmca will be compiled" >&5 -printf "%s\n" "$as_me: wwmca will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: wwmca will be compiled" >&5 +$as_echo "$as_me: wwmca will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: wwmca will not be compiled" >&5 -printf "%s\n" "$as_me: wwmca will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: wwmca will not be compiled" >&5 +$as_echo "$as_me: wwmca will not be compiled" >&6;} fi # modis # Check whether --enable-modis was given. -if test ${enable_modis+y} -then : +if test "${enable_modis+set}" = set; then : enableval=$enable_modis; case "${enableval}" in yes | no ) ENABLE_MODIS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-modis" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_MODIS="no" fi @@ -6634,25 +5871,24 @@ fi if test "x$ENABLE_MODIS" = "xyes"; then -printf "%s\n" "#define ENABLE_MODIS /**/" >>confdefs.h +$as_echo "#define ENABLE_MODIS /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: modis will be compiled" >&5 -printf "%s\n" "$as_me: modis will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: modis will be compiled" >&5 +$as_echo "$as_me: modis will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: modis will not be compiled" >&5 -printf "%s\n" "$as_me: modis will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: modis will not be compiled" >&5 +$as_echo "$as_me: modis will not be compiled" >&6;} fi # mode_graphics # Check whether --enable-mode_graphics was given. -if test ${enable_mode_graphics+y} -then : +if test "${enable_mode_graphics+set}" = set; then : enableval=$enable_mode_graphics; case "${enableval}" in yes | no ) ENABLE_MODE_GRAPHICS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --enable-mode_graphics" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_MODE_GRAPHICS="no" fi @@ -6669,25 +5905,24 @@ fi if test "x$ENABLE_MODE_GRAPHICS" = "xyes"; then -printf "%s\n" "#define ENABLE_MODE_GRAPHICS /**/" >>confdefs.h +$as_echo "#define ENABLE_MODE_GRAPHICS /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: mode_graphics will be compiled" >&5 -printf "%s\n" "$as_me: mode_graphics will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: mode_graphics will be compiled" >&5 +$as_echo "$as_me: mode_graphics will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: mode_graphics will not be compiled" >&5 -printf "%s\n" "$as_me: mode_graphics will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: mode_graphics will not be compiled" >&5 +$as_echo "$as_me: mode_graphics will not be compiled" >&6;} fi # mode_time_domain # Check whether --enable-mode_time_domain was given. -if test ${enable_mode_time_domain+y} -then : +if test "${enable_mode_time_domain+set}" = set; then : enableval=$enable_mode_time_domain; case "${enableval}" in yes | no ) ENABLE_MODE_TIME_DOMAIN="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-mode_time_domain" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_MODE_TIME_DOMAIN="yes" fi @@ -6704,25 +5939,24 @@ fi if test "x$ENABLE_MODE_TIME_DOMAIN" = "xyes"; then -printf "%s\n" "#define ENABLE_MODE_TIME_DOMAIN /**/" >>confdefs.h +$as_echo "#define ENABLE_MODE_TIME_DOMAIN /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: mode_time_domain will be compiled" >&5 -printf "%s\n" "$as_me: mode_time_domain will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: mode_time_domain will be compiled" >&5 +$as_echo "$as_me: mode_time_domain will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: mode_time_domain will not be compiled" >&5 -printf "%s\n" "$as_me: mode_time_domain will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: mode_time_domain will not be compiled" >&5 +$as_echo "$as_me: mode_time_domain will not be compiled" >&6;} fi # tc_utils # Check whether --enable-tc_utils was given. -if test ${enable_tc_utils+y} -then : +if test "${enable_tc_utils+set}" = set; then : enableval=$enable_tc_utils; case "${enableval}" in yes | no ) ENABLE_TC_UTILS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-tc_utils" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_TC_UTILS="yes" fi @@ -6739,25 +5973,24 @@ fi if test "x$ENABLE_TC_UTILS" = "xyes"; then -printf "%s\n" "#define ENABLE_TC_UTILS /**/" >>confdefs.h +$as_echo "#define ENABLE_TC_UTILS /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: tc_utils will be compiled" >&5 -printf "%s\n" "$as_me: tc_utils will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: tc_utils will be compiled" >&5 +$as_echo "$as_me: tc_utils will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: tc_utils will not be compiled" >&5 -printf "%s\n" "$as_me: tc_utils will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: tc_utils will not be compiled" >&5 +$as_echo "$as_me: tc_utils will not be compiled" >&6;} fi # gsi_tools # Check whether --enable-gsi_tools was given. -if test ${enable_gsi_tools+y} -then : +if test "${enable_gsi_tools+set}" = set; then : enableval=$enable_gsi_tools; case "${enableval}" in yes | no ) ENABLE_GSI_TOOLS="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --disable-gsi_tools" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_GSI_TOOLS="yes" fi @@ -6774,25 +6007,24 @@ fi if test "x$ENABLE_GSI_TOOLS" = "xyes"; then -printf "%s\n" "#define ENABLE_GSI_TOOLS /**/" >>confdefs.h +$as_echo "#define ENABLE_GSI_TOOLS /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: gsi_tools will be compiled" >&5 -printf "%s\n" "$as_me: gsi_tools will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: gsi_tools will be compiled" >&5 +$as_echo "$as_me: gsi_tools will be compiled" >&6;} else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: gsi_tools will not be compiled" >&5 -printf "%s\n" "$as_me: gsi_tools will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: gsi_tools will not be compiled" >&5 +$as_echo "$as_me: gsi_tools will not be compiled" >&6;} fi # GRIB2 # Check whether --enable-grib2 was given. -if test ${enable_grib2+y} -then : +if test "${enable_grib2+set}" = set; then : enableval=$enable_grib2; case "${enableval}" in yes | no ) ENABLE_GRIB2="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --enable-grib2" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_GRIB2="no" fi @@ -6817,14 +6049,14 @@ fi if test "x$ENABLE_GRIB2" = "xyes"; then -printf "%s\n" "#define ENABLE_GRIB2 /**/" >>confdefs.h +$as_echo "#define ENABLE_GRIB2 /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: GRIB2 utilites will be compiled" >&5 -printf "%s\n" "$as_me: GRIB2 utilites will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: GRIB2 utilites will be compiled" >&5 +$as_echo "$as_me: GRIB2 utilites will be compiled" >&6;} CPPFLAGS="${CPPFLAGS} -DWITH_GRIB2" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: GRIB2CLIB_NAME will be set" >&5 -printf "%s\n" "$as_me: GRIB2CLIB_NAME will be set" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: GRIB2CLIB_NAME will be set" >&5 +$as_echo "$as_me: GRIB2CLIB_NAME will be set" >&6;} if test -z "$GRIB2CLIB_NAME"; then GRIB2_MET_LIBS="-lvx_data2d_grib2" GRIB2_DEP_LIBS="-lgrib2c -ljasper -lpng -lz" @@ -6833,8 +6065,8 @@ printf "%s\n" "$as_me: GRIB2CLIB_NAME will be set" >&6;} GRIB2_DEP_LIBS="${GRIB2CLIB_NAME} -ljasper -lpng -lz" fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: GRIB2 utilities will not be compiled" >&5 -printf "%s\n" "$as_me: GRIB2 utilities will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: GRIB2 utilities will not be compiled" >&5 +$as_echo "$as_me: GRIB2 utilities will not be compiled" >&6;} GRIB2_MET_LIBS= GRIB2_DEP_LIBS= fi @@ -6844,13 +6076,12 @@ fi # Python # Check whether --enable-python was given. -if test ${enable_python+y} -then : +if test "${enable_python+set}" = set; then : enableval=$enable_python; case "${enableval}" in yes | no ) ENABLE_PYTHON="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --enable-python" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_PYTHON="no" fi @@ -6867,16 +6098,16 @@ fi if test "x$ENABLE_PYTHON" = "xyes"; then -printf "%s\n" "#define ENABLE_PYTHON /**/" >>confdefs.h +$as_echo "#define ENABLE_PYTHON /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: python embedding will be compiled" >&5 -printf "%s\n" "$as_me: python embedding will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: python embedding will be compiled" >&5 +$as_echo "$as_me: python embedding will be compiled" >&6;} CPPFLAGS="${CPPFLAGS} -DWITH_PYTHON" PYTHON_MET_LIBS="-lvx_data2d_python -lvx_pointdata_python -lvx_python3_utils" PYTHON_DEP_LIBS="${MET_PYTHON_LD}" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: python embedding will not be compiled" >&5 -printf "%s\n" "$as_me: python embedding will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: python embedding will not be compiled" >&5 +$as_echo "$as_me: python embedding will not be compiled" >&6;} PYTHON_MET_LIBS= PYTHON_DEP_LIBS= fi @@ -6886,13 +6117,12 @@ fi # Unstructure grid with ECMF libraries (Atlas/ecKit) # Check whether --enable-ugrid was given. -if test ${enable_ugrid+y} -then : +if test "${enable_ugrid+set}" = set; then : enableval=$enable_ugrid; case "${enableval}" in yes | no ) ENABLE_UGRID="${enableval}" ;; *) as_fn_error $? "bad value ${enableval} for --enable-ugrid" "$LINENO" 5 ;; esac -else $as_nop +else ENABLE_UGRID="no" fi @@ -6909,17 +6139,17 @@ fi if test "x$ENABLE_UGRID" = "xyes"; then -printf "%s\n" "#define ENABLE_UGRID /**/" >>confdefs.h +$as_echo "#define ENABLE_UGRID /**/" >>confdefs.h - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: unstructured grid will be compiled" >&5 -printf "%s\n" "$as_me: unstructured grid will be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: unstructured grid will be compiled" >&5 +$as_echo "$as_me: unstructured grid will be compiled" >&6;} CPPFLAGS="${CPPFLAGS} -I${MET_ATLASINC} -I${MET_ECKITINC} -DWITH_UGRID" LDFLAGS="${LDFLAGS} -L${MET_ATLASLIB} -L${MET_ECKITLIB} -Wl,-rpath,${MET_ATLASLIB}:${MET_ECKITLIB}" UGRID_MET_LIBS="-lvx_data2d_ugrid" UGRID_DEP_LIBS="-latlas -leckit -leckit_mpi -leckit_geometry" else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: unstructured grid will not be compiled" >&5 -printf "%s\n" "$as_me: unstructured grid will not be compiled" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: unstructured grid will not be compiled" >&5 +$as_echo "$as_me: unstructured grid will not be compiled" >&6;} UGRID_MET_LIBS= UGRID_DEP_LIBS= fi @@ -6978,12 +6208,11 @@ for ac_prog in 'bison -y' byacc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_YACC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_YACC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else @@ -6991,15 +6220,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_YACC="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7010,11 +6235,11 @@ fi fi YACC=$ac_cv_prog_YACC if test -n "$YACC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 -printf "%s\n" "$YACC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 +$as_echo "$YACC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7022,12 +6247,6 @@ fi done test -n "$YACC" || YACC="yacc" - - - - - - ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7038,16 +6257,15 @@ if test -z "$CXX"; then CXX=$CCC else if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else @@ -7055,15 +6273,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7074,11 +6288,11 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -printf "%s\n" "$CXX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +$as_echo "$CXX" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7087,16 +6301,15 @@ fi fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++ + for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CXX+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CXX+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. else @@ -7104,15 +6317,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7123,11 +6332,11 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -printf "%s\n" "$ac_ct_CXX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7139,8 +6348,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX @@ -7150,7 +6359,7 @@ fi fi fi # Provide some information about the compiler. -printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -7160,7 +6369,7 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -7170,21 +6379,20 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 -printf %s "checking whether the compiler supports GNU C++... " >&6; } -if test ${ac_cv_cxx_compiler_gnu+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } +if ${ac_cv_cxx_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { #ifndef __GNUC__ choke me @@ -7194,33 +6402,29 @@ main (void) return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : ac_compiler_gnu=yes -else $as_nop +else ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GXX=yes else GXX= fi -ac_test_CXXFLAGS=${CXXFLAGS+y} +ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -printf %s "checking whether $CXX accepts -g... " >&6; } -if test ${ac_cv_prog_cxx_g+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } +if ${ac_cv_prog_cxx_g+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes ac_cv_prog_cxx_g=no @@ -7229,60 +6433,57 @@ else $as_nop /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes -else $as_nop +else CXXFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : -else $as_nop +else ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO" -then : +if ac_fn_cxx_try_compile "$LINENO"; then : ac_cv_prog_cxx_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } -if test $ac_test_CXXFLAGS; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$ac_cv_prog_cxx_g" >&6; } +if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then if test "$GXX" = yes; then @@ -7297,100 +6498,6 @@ else CXXFLAGS= fi fi -ac_prog_cxx_stdcxx=no -if test x$ac_prog_cxx_stdcxx = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 -printf %s "checking for $CXX option to enable C++11 features... " >&6; } -if test ${ac_cv_prog_cxx_cxx11+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cxx_cxx11=no -ac_save_CXX=$CXX -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_cxx_conftest_cxx11_program -_ACEOF -for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA -do - CXX="$ac_save_CXX $ac_arg" - if ac_fn_cxx_try_compile "$LINENO" -then : - ac_cv_prog_cxx_cxx11=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cxx_cxx11" != "xno" && break -done -rm -f conftest.$ac_ext -CXX=$ac_save_CXX -fi - -if test "x$ac_cv_prog_cxx_cxx11" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cxx_cxx11" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 -printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx11" -fi - ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 - ac_prog_cxx_stdcxx=cxx11 -fi -fi -if test x$ac_prog_cxx_stdcxx = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 -printf %s "checking for $CXX option to enable C++98 features... " >&6; } -if test ${ac_cv_prog_cxx_cxx98+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cxx_cxx98=no -ac_save_CXX=$CXX -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_cxx_conftest_cxx98_program -_ACEOF -for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA -do - CXX="$ac_save_CXX $ac_arg" - if ac_fn_cxx_try_compile "$LINENO" -then : - ac_cv_prog_cxx_cxx98=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cxx_cxx98" != "xno" && break -done -rm -f conftest.$ac_ext -CXX=$ac_save_CXX -fi - -if test "x$ac_cv_prog_cxx_cxx98" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cxx_cxx98" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 -printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } - CXX="$CXX $ac_cv_prog_cxx_cxx98" -fi - ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 - ac_prog_cxx_stdcxx=cxx98 -fi -fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7399,12 +6506,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CXX" am_compiler_list= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -printf %s "checking dependency style of $depcc... " >&6; } -if test ${am_cv_CXX_dependencies_compiler_type+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CXX_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -7511,8 +6617,8 @@ else fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 -printf "%s\n" "$am_cv_CXX_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type if @@ -7534,12 +6640,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -7547,15 +6652,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7566,11 +6667,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7579,12 +6680,11 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -7592,15 +6692,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7611,11 +6707,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -7623,8 +6719,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -7637,12 +6733,11 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -7650,15 +6745,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7669,11 +6760,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7682,12 +6773,11 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -7696,19 +6786,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7724,18 +6810,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7743,125 +6829,14 @@ fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } -else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. -set dummy ${ac_tool_prefix}clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -7869,15 +6844,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7888,25 +6859,28 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -printf "%s\n" "$CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + test -n "$CC" && break + done fi -if test -z "$ac_cv_prog_CC"; then +if test -z "$CC"; then ac_ct_CC=$CC - # Extract the first word of "clang", so it can be a program name with args. -set dummy clang; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_CC+y} -then : - printf %s "(cached) " >&6 -else $as_nop + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -7914,15 +6888,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="clang" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7933,48 +6903,50 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -printf "%s\n" "$ac_ct_CC" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + + test -n "$ac_ct_CC" && break +done + if test "x$ac_ct_CC" = x; then CC="" else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC fi -else - CC="$ac_cv_prog_CC" fi fi -test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion -version; do +for ac_option in --version -v -V -qversion; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -7984,21 +6956,20 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 -printf %s "checking whether the compiler supports GNU C... " >&6; } -if test ${ac_cv_c_compiler_gnu+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { #ifndef __GNUC__ choke me @@ -8008,33 +6979,29 @@ main (void) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes -else $as_nop +else ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } -ac_compiler_gnu=$ac_cv_c_compiler_gnu - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+y} +ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -printf %s "checking whether $CC accepts -g... " >&6; } -if test ${ac_cv_prog_cc_g+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -8043,60 +7010,57 @@ else $as_nop /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else $as_nop +else CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : -else $as_nop +else ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -printf "%s\n" "$ac_cv_prog_cc_g" >&6; } -if test $ac_test_CFLAGS; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -8111,144 +7075,94 @@ else CFLAGS= fi fi -ac_prog_cc_stdc=no -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 -printf %s "checking for $CC option to enable C11 features... " >&6; } -if test ${ac_cv_prog_cc_c11+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c11=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_c_conftest_c11_program -_ACEOF -for ac_arg in '' -std=gnu11 -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c11=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c11" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} -if test "x$ac_cv_prog_cc_c11" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c11" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 -printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } - CC="$CC $ac_cv_prog_cc_c11" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 - ac_prog_cc_stdc=c11 -fi -fi -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 -printf %s "checking for $CC option to enable C99 features... " >&6; } -if test ${ac_cv_prog_cc_c99+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_c_conftest_c99_program -_ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : - ac_cv_prog_cc_c99=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam - test "x$ac_cv_prog_cc_c99" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -if test "x$ac_cv_prog_cc_c99" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c99" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } - CC="$CC $ac_cv_prog_cc_c99" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 - ac_prog_cc_stdc=c99 -fi -fi -if test x$ac_prog_cc_stdc = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 -printf %s "checking for $CC option to enable C89 features... " >&6; } -if test ${ac_cv_prog_cc_c89+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$ac_c_conftest_c89_program +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO" -then : + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext conftest.beam +rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC -fi -if test "x$ac_cv_prog_cc_c89" = xno -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -printf "%s\n" "unsupported" >&6; } -else $as_nop - if test "x$ac_cv_prog_cc_c89" = x -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -printf "%s\n" "none needed" >&6; } -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } - CC="$CC $ac_cv_prog_cc_c89" -fi - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 - ac_prog_cc_stdc=c89 fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + fi ac_ext=c @@ -8257,23 +7171,21 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - - ac_ext=c +ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -printf %s "checking whether $CC understands -c and -o together... " >&6; } -if test ${am_cv_prog_cc_c_o+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main (void) +main () { ; @@ -8301,8 +7213,8 @@ _ACEOF rm -f core conftest* unset am_i fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } if test "$am_cv_prog_cc_c_o" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. @@ -8320,12 +7232,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CC" am_compiler_list= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -printf %s "checking dependency style of $depcc... " >&6; } -if test ${am_cv_CC_dependencies_compiler_type+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -8432,8 +7343,8 @@ else fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -8456,12 +7367,11 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_F77+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_F77+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$F77"; then ac_cv_prog_F77="$F77" # Let the user override the test. else @@ -8469,15 +7379,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8488,11 +7394,11 @@ fi fi F77=$ac_cv_prog_F77 if test -n "$F77"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $F77" >&5 -printf "%s\n" "$F77" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5 +$as_echo "$F77" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -8505,12 +7411,11 @@ if test -z "$F77"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_F77+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_F77+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_F77"; then ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. else @@ -8518,15 +7423,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_F77="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8537,11 +7438,11 @@ fi fi ac_ct_F77=$ac_cv_prog_ac_ct_F77 if test -n "$ac_ct_F77"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5 -printf "%s\n" "$ac_ct_F77" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5 +$as_echo "$ac_ct_F77" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -8553,8 +7454,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac F77=$ac_ct_F77 @@ -8563,7 +7464,7 @@ fi # Provide some information about the compiler. -printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -8573,7 +7474,7 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -8583,7 +7484,7 @@ printf "%s\n" "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done rm -f a.out @@ -8592,12 +7493,11 @@ rm -f a.out # input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU Fortran 77" >&5 -printf %s "checking whether the compiler supports GNU Fortran 77... " >&6; } -if test ${ac_cv_f77_compiler_gnu+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5 +$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } +if ${ac_cv_f77_compiler_gnu+:} false; then : + $as_echo_n "(cached) " >&6 +else cat > conftest.$ac_ext <<_ACEOF program main #ifndef __GNUC__ @@ -8606,48 +7506,43 @@ else $as_nop end _ACEOF -if ac_fn_f77_try_compile "$LINENO" -then : +if ac_fn_f77_try_compile "$LINENO"; then : ac_compiler_gnu=yes -else $as_nop +else ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5 -printf "%s\n" "$ac_cv_f77_compiler_gnu" >&6; } -ac_compiler_gnu=$ac_cv_f77_compiler_gnu - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5 +$as_echo "$ac_cv_f77_compiler_gnu" >&6; } ac_ext=$ac_save_ext -ac_test_FFLAGS=${FFLAGS+y} +ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5 -printf %s "checking whether $F77 accepts -g... " >&6; } -if test ${ac_cv_prog_f77_g+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5 +$as_echo_n "checking whether $F77 accepts -g... " >&6; } +if ${ac_cv_prog_f77_g+:} false; then : + $as_echo_n "(cached) " >&6 +else FFLAGS=-g cat > conftest.$ac_ext <<_ACEOF program main end _ACEOF -if ac_fn_f77_try_compile "$LINENO" -then : +if ac_fn_f77_try_compile "$LINENO"; then : ac_cv_prog_f77_g=yes -else $as_nop +else ac_cv_prog_f77_g=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5 -printf "%s\n" "$ac_cv_prog_f77_g" >&6; } -if test $ac_test_FFLAGS; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5 +$as_echo "$ac_cv_prog_f77_g" >&6; } +if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then if test "x$ac_cv_f77_compiler_gnu" = xyes; then @@ -8678,12 +7573,11 @@ for ac_prog in flex lex do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_LEX+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LEX+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$LEX"; then ac_cv_prog_LEX="$LEX" # Let the user override the test. else @@ -8691,15 +7585,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LEX="$ac_prog" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8710,11 +7600,11 @@ fi fi LEX=$ac_cv_prog_LEX if test -n "$LEX"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 -printf "%s\n" "$LEX" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 +$as_echo "$LEX" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -8722,26 +7612,15 @@ fi done test -n "$LEX" || LEX=":" - if test "x$LEX" != "x:"; then - cat >conftest.l <<_ACEOF -%{ -#ifdef __cplusplus -extern "C" -#endif -int yywrap(void); -%} +if test "x$LEX" != "x:"; then + cat >conftest.l <<_ACEOF %% a { ECHO; } b { REJECT; } c { yymore (); } d { yyless (1); } e { /* IRIX 6.5 flex 2.5.4 underquotes its yyless argument. */ -#ifdef __cplusplus - yyless ((yyinput () != 0)); -#else - yyless ((input () != 0)); -#endif - } + yyless ((input () != 0)); } f { unput (yytext[0]); } . { BEGIN INITIAL; } %% @@ -8749,205 +7628,101 @@ f { unput (yytext[0]); } extern char *yytext; #endif int -yywrap (void) -{ - return 1; -} -int main (void) { - return ! yylex (); + return ! yylex () + ! yywrap (); } _ACEOF -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lex output file root" >&5 -printf %s "checking for lex output file root... " >&6; } -if test ${ac_cv_prog_lex_root+y} -then : - printf %s "(cached) " >&6 -else $as_nop - -ac_cv_prog_lex_root=unknown { { ac_try="$LEX conftest.l" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 +$as_echo "$ac_try_echo"; } >&5 (eval "$LEX conftest.l") 2>&5 ac_status=$? - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5 +$as_echo_n "checking lex output file root... " >&6; } +if ${ac_cv_prog_lex_root+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -f lex.yy.c; then ac_cv_prog_lex_root=lex.yy elif test -f lexyy.c; then ac_cv_prog_lex_root=lexyy +else + as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5 fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 -printf "%s\n" "$ac_cv_prog_lex_root" >&6; } -if test "$ac_cv_prog_lex_root" = unknown -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot find output from $LEX; giving up on $LEX" >&5 -printf "%s\n" "$as_me: WARNING: cannot find output from $LEX; giving up on $LEX" >&2;} - LEX=: LEXLIB= -fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 +$as_echo "$ac_cv_prog_lex_root" >&6; } LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root -if test ${LEXLIB+y} -then : - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lex library" >&5 -printf %s "checking for lex library... " >&6; } -if test ${ac_cv_lib_lex+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - ac_save_LIBS="$LIBS" - ac_found=false - for ac_cv_lib_lex in 'none needed' -lfl -ll 'not found'; do - case $ac_cv_lib_lex in #( - 'none needed') : - ;; #( - 'not found') : - break ;; #( - *) : - LIBS="$ac_cv_lib_lex $ac_save_LIBS" ;; #( - *) : - ;; -esac +if test -z "${LEXLIB+set}"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5 +$as_echo_n "checking lex library... " >&6; } +if ${ac_cv_lib_lex+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_save_LIBS=$LIBS + ac_cv_lib_lex='none needed' + for ac_lib in '' -lfl -ll; do + LIBS="$ac_lib $ac_save_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ `cat $LEX_OUTPUT_ROOT.c` _ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_found=: +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_lex=$ac_lib fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if $ac_found; then - break - fi + test "$ac_cv_lib_lex" != 'none needed' && break done - LIBS="$ac_save_LIBS" - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5 -printf "%s\n" "$ac_cv_lib_lex" >&6; } - if test "$ac_cv_lib_lex" = 'not found' -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: required lex library not found; giving up on $LEX" >&5 -printf "%s\n" "$as_me: WARNING: required lex library not found; giving up on $LEX" >&2;} - LEX=: LEXLIB= -elif test "$ac_cv_lib_lex" = 'none needed' -then : - LEXLIB='' -else $as_nop - LEXLIB=$ac_cv_lib_lex -fi - ac_save_LIBS="$LIBS" - LIBS= - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing yywrap" >&5 -printf %s "checking for library containing yywrap... " >&6; } -if test ${ac_cv_search_yywrap+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -char yywrap (); -int -main (void) -{ -return yywrap (); - ; - return 0; -} -_ACEOF -for ac_lib in '' fl l -do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO" -then : - ac_cv_search_yywrap=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext - if test ${ac_cv_search_yywrap+y} -then : - break -fi -done -if test ${ac_cv_search_yywrap+y} -then : + LIBS=$ac_save_LIBS -else $as_nop - ac_cv_search_yywrap=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_yywrap" >&5 -printf "%s\n" "$ac_cv_search_yywrap" >&6; } -ac_res=$ac_cv_search_yywrap -if test "$ac_res" != no -then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - LEXLIB="$LIBS" fi - - LIBS="$ac_save_LIBS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5 +$as_echo "$ac_cv_lib_lex" >&6; } + test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex fi -if test "$LEX" != : -then : - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 -printf %s "checking whether yytext is a pointer... " >&6; } -if test ${ac_cv_prog_lex_yytext_pointer+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5 +$as_echo_n "checking whether yytext is a pointer... " >&6; } +if ${ac_cv_prog_lex_yytext_pointer+:} false; then : + $as_echo_n "(cached) " >&6 +else # POSIX says lex can declare yytext either as a pointer or an array; the # default is implementation-dependent. Figure out which it is, since # not all implementations provide the %pointer and %array declarations. ac_cv_prog_lex_yytext_pointer=no +ac_save_LIBS=$LIBS +LIBS="$LEXLIB $ac_save_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define YYTEXT_POINTER 1 `cat $LEX_OUTPUT_ROOT.c` _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_prog_lex_yytext_pointer=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5 -printf "%s\n" "$ac_cv_prog_lex_yytext_pointer" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5 +$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; } if test $ac_cv_prog_lex_yytext_pointer = yes; then -printf "%s\n" "#define YYTEXT_POINTER 1" >>confdefs.h - -fi +$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h fi rm -f conftest.l $LEX_OUTPUT_ROOT.c @@ -8956,12 +7731,11 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_RANLIB+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else @@ -8969,15 +7743,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8988,11 +7758,11 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -printf "%s\n" "$RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi @@ -9001,12 +7771,11 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -printf %s "checking for $ac_word... " >&6; } -if test ${ac_cv_prog_ac_ct_RANLIB+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else @@ -9014,15 +7783,11 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac + test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9033,11 +7798,11 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -printf "%s\n" "$ac_ct_RANLIB" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -9045,8 +7810,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -9058,29 +7823,26 @@ fi # Checks for libraries. +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - - # Make sure we can run config.sub. -$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -printf %s "checking build system type... " >&6; } -if test ${ac_cv_build+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -printf "%s\n" "$ac_cv_build" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -9099,22 +7861,21 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -printf %s "checking host system type... " >&6; } -if test ${ac_cv_host+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : + $as_echo_n "(cached) " >&6 +else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || - as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -printf "%s\n" "$ac_cv_host" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -9138,19 +7899,17 @@ ac_ext=f ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to get verbose linking output from $F77" >&5 -printf %s "checking how to get verbose linking output from $F77... " >&6; } -if test ${ac_cv_prog_f77_v+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get verbose linking output from $F77" >&5 +$as_echo_n "checking how to get verbose linking output from $F77... " >&6; } +if ${ac_cv_prog_f77_v+:} false; then : + $as_echo_n "(cached) " >&6 +else cat > conftest.$ac_ext <<_ACEOF program main end _ACEOF -if ac_fn_f77_try_compile "$LINENO" -then : +if ac_fn_f77_try_compile "$LINENO"; then : ac_cv_prog_f77_v= # Try some options frequently used verbose output for ac_verb in -v -verbose --verbose -V -\#\#\#; do @@ -9168,13 +7927,13 @@ ac_save_FFLAGS=$FFLAGS FFLAGS="$FFLAGS $ac_verb" eval "set x $ac_link" shift -printf "%s\n" "$as_me:${as_lineno-$LINENO}: $*" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5 # gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH, # LIBRARY_PATH; skip all such settings. ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | sed '/^Driving:/d; /^Configured with:/d; '"/^[_$as_cr_Letters][_$as_cr_alnum]*=/d"` -printf "%s\n" "$ac_f77_v_output" >&5 +$as_echo "$ac_f77_v_output" >&5 FFLAGS=$ac_save_FFLAGS rm -rf conftest* @@ -9241,24 +8000,23 @@ esac done done if test -z "$ac_cv_prog_f77_v"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine how to obtain linking information from $F77" >&5 -printf "%s\n" "$as_me: WARNING: cannot determine how to obtain linking information from $F77" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot determine how to obtain linking information from $F77" >&5 +$as_echo "$as_me: WARNING: cannot determine how to obtain linking information from $F77" >&2;} fi -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: compilation failed" >&5 -printf "%s\n" "$as_me: WARNING: compilation failed" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: compilation failed" >&5 +$as_echo "$as_me: WARNING: compilation failed" >&2;} fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_v" >&5 -printf "%s\n" "$ac_cv_prog_f77_v" >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 libraries of $F77" >&5 -printf %s "checking for Fortran 77 libraries of $F77... " >&6; } -if test ${ac_cv_f77_libs+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_v" >&5 +$as_echo "$ac_cv_prog_f77_v" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 libraries of $F77" >&5 +$as_echo_n "checking for Fortran 77 libraries of $F77... " >&6; } +if ${ac_cv_f77_libs+:} false; then : + $as_echo_n "(cached) " >&6 +else if test "x$FLIBS" != "x"; then ac_cv_f77_libs="$FLIBS" # Let the user override the test. else @@ -9277,13 +8035,13 @@ ac_save_FFLAGS=$FFLAGS FFLAGS="$FFLAGS $ac_cv_prog_f77_v" eval "set x $ac_link" shift -printf "%s\n" "$as_me:${as_lineno-$LINENO}: $*" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: $*" >&5 # gfortran 4.3 outputs lines setting COLLECT_GCC_OPTIONS, COMPILER_PATH, # LIBRARY_PATH; skip all such settings. ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | sed '/^Driving:/d; /^Configured with:/d; '"/^[_$as_cr_Letters][_$as_cr_alnum]*=/d"` -printf "%s\n" "$ac_f77_v_output" >&5 +$as_echo "$ac_f77_v_output" >&5 FFLAGS=$ac_save_FFLAGS rm -rf conftest* @@ -9360,10 +8118,9 @@ while test $# != 1; do fi done - if test x"$ac_exists" = xtrue -then : + if test x"$ac_exists" = xtrue; then : -else $as_nop +else ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" fi ;; @@ -9376,10 +8133,9 @@ fi fi done - if test x"$ac_exists" = xtrue -then : + if test x"$ac_exists" = xtrue; then : -else $as_nop +else if test "$ac_compiler_gnu" = yes; then for ac_link_opt in $ac_arg; do ac_cv_f77_libs="$ac_cv_f77_libs -Xlinker $ac_link_opt" @@ -9394,24 +8150,9 @@ fi |-LANG:=* | -LIST:* | -LNO:* | -link) ;; -lkernel32) - # Ignore this library only on Windows-like systems. case $host_os in - cygwin* | msys* ) ;; - *) - ac_exists=false - for ac_i in $ac_cv_f77_libs; do - if test x"$ac_arg" = x"$ac_i"; then - ac_exists=true - break - fi - done - - if test x"$ac_exists" = xtrue -then : - -else $as_nop - ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" -fi + *cygwin*) ;; + *) ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" ;; esac ;; @@ -9429,7 +8170,7 @@ fi esac ;; -YP,*) - for ac_j in `printf "%s\n" "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do + for ac_j in `$as_echo "$ac_arg" | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do ac_exists=false for ac_i in $ac_cv_f77_libs; do if test x"$ac_j" = x"$ac_i"; then @@ -9438,10 +8179,9 @@ fi fi done - if test x"$ac_exists" = xtrue -then : + if test x"$ac_exists" = xtrue; then : -else $as_nop +else ac_arg="$ac_arg $ac_j" ac_cv_f77_libs="$ac_cv_f77_libs $ac_j" fi @@ -9456,47 +8196,185 @@ fi fi done - if test x"$ac_exists" = xtrue -then : + if test x"$ac_exists" = xtrue; then : + +else + ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" +fi + ;; + -zallextract*| -zdefaultextract) + ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" + ;; + # Ignore everything else. + esac +done +# restore positional arguments +set X $ac_save_positional; shift + +# We only consider "LD_RUN_PATH" on Solaris systems. If this is seen, +# then we insist that the "run path" must be an absolute path (i.e. it +# must begin with a "/"). +case `(uname -sr) 2>/dev/null` in + "SunOS 5"*) + ac_ld_run_path=`$as_echo "$ac_f77_v_output" | + sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'` + test "x$ac_ld_run_path" != x && + if test "$ac_compiler_gnu" = yes; then + for ac_link_opt in $ac_ld_run_path; do + ac_cv_f77_libs="$ac_cv_f77_libs -Xlinker $ac_link_opt" + done +else + ac_cv_f77_libs="$ac_cv_f77_libs $ac_ld_run_path" +fi + ;; +esac +fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_libs" >&5 +$as_echo "$ac_cv_f77_libs" >&6; } +FLIBS="$ac_cv_f77_libs" + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +# Checks for header files. + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + + done + ac_cv_prog_CPP=$CPP -else $as_nop - ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" fi - ;; - -zallextract*| -zdefaultextract) - ac_cv_f77_libs="$ac_cv_f77_libs $ac_arg" - ;; - -mllvm) ${2+shift};; # Defend against 'clang -mllvm -loopopt=0'. - # Ignore everything else. - esac -done -# restore positional arguments -set X $ac_save_positional; shift + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : -# We only consider "LD_RUN_PATH" on Solaris systems. If this is seen, -# then we insist that the "run path" must be an absolute path (i.e. it -# must begin with a "/"). -case `(uname -sr) 2>/dev/null` in - "SunOS 5"*) - ac_ld_run_path=`printf "%s\n" "$ac_f77_v_output" | - sed -n 's,^.*LD_RUN_PATH *= *\(/[^ ]*\).*$,-R\1,p'` - test "x$ac_ld_run_path" != x && - if test "$ac_compiler_gnu" = yes; then - for ac_link_opt in $ac_ld_run_path; do - ac_cv_f77_libs="$ac_cv_f77_libs -Xlinker $ac_link_opt" - done else - ac_cv_f77_libs="$ac_cv_f77_libs $ac_ld_run_path" + # Broken: fails on valid input. +continue fi - ;; -esac -fi # test "x$[]_AC_LANG_PREFIX[]LIBS" = "x" +rm -f conftest.err conftest.i conftest.$ac_ext + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_libs" >&5 -printf "%s\n" "$ac_cv_f77_libs" >&6; } -FLIBS="$ac_cv_f77_libs" +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -9505,277 +8383,394 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Checks for header files. - -ac_header= ac_cache= -for ac_item in $ac_header_c_list +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_GREP=$GREP +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no fi -ac_fn_c_check_header_compile "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default" -if test "x$ac_cv_header_errno_h" = xyes -then : - printf "%s\n" "#define HAVE_ERRNO_H 1" >>confdefs.h +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default" -if test "x$ac_cv_header_fcntl_h" = xyes -then : - printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -fi -ac_fn_c_check_header_compile "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" -if test "x$ac_cv_header_inttypes_h" = xyes -then : - printf "%s\n" "#define HAVE_INTTYPES_H 1" >>confdefs.h +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : +else + ac_cv_header_stdc=no fi -ac_fn_c_check_header_compile "$LINENO" "limits.h" "ac_cv_header_limits_h" "$ac_includes_default" -if test "x$ac_cv_header_limits_h" = xyes -then : - printf "%s\n" "#define HAVE_LIMITS_H 1" >>confdefs.h +rm -f conftest* fi -ac_fn_c_check_header_compile "$LINENO" "memory.h" "ac_cv_header_memory_h" "$ac_includes_default" -if test "x$ac_cv_header_memory_h" = xyes -then : - printf "%s\n" "#define HAVE_MEMORY_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default" -if test "x$ac_cv_header_stddef_h" = xyes -then : - printf "%s\n" "#define HAVE_STDDEF_H 1" >>confdefs.h +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include -fi -ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = xyes -then : - printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : +else + ac_cv_header_stdc=no fi -ac_fn_c_check_header_compile "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" -if test "x$ac_cv_header_string_h" = xyes -then : - printf "%s\n" "#define HAVE_STRING_H 1" >>confdefs.h +rm -f conftest* fi -ac_fn_c_check_header_compile "$LINENO" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default" -if test "x$ac_cv_header_strings_h" = xyes -then : - printf "%s\n" "#define HAVE_STRINGS_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "sys/file.h" "ac_cv_header_sys_file_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_file_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_FILE_H 1" >>confdefs.h +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_param_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" -if test "x$ac_cv_header_unistd_h" = xyes -then : - printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -# Checks for typedefs, structures, and compiler characteristics. +fi -ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" -if test "x$ac_cv_type__Bool" = xyes -then : +done -printf "%s\n" "#define HAVE__BOOL 1" >>confdefs.h +for ac_header in errno.h fcntl.h inttypes.h limits.h memory.h stddef.h stdlib.h string.h strings.h sys/file.h sys/param.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 -printf %s "checking for stdbool.h that conforms to C99... " >&6; } -if test ${ac_cv_header_stdbool_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include +done - #ifndef __bool_true_false_are_defined - #error "__bool_true_false_are_defined is not defined" - #endif - char a[__bool_true_false_are_defined == 1 ? 1 : -1]; - /* Regardless of whether this is C++ or "_Bool" is a - valid type name, "true" and "false" should be usable - in #if expressions and integer constant expressions, - and "bool" should be a valid type name. */ +# Checks for typedefs, structures, and compiler characteristics. + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 +$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } +if ${ac_cv_header_stdbool_h+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - #if !true - #error "'true' is not true" + #include + #ifndef bool + "error: bool is not defined" #endif - #if true != 1 - #error "'true' is not equal to 1" + #ifndef false + "error: false is not defined" #endif - char b[true == 1 ? 1 : -1]; - char c[true]; - #if false - #error "'false' is not false" + "error: false is not 0" #endif - #if false != 0 - #error "'false' is not equal to 0" + #ifndef true + "error: true is not defined" + #endif + #if true != 1 + "error: true is not 1" + #endif + #ifndef __bool_true_false_are_defined + "error: __bool_true_false_are_defined is not defined" #endif - char d[false == 0 ? 1 : -1]; - - enum { e = false, f = true, g = false * true, h = true * 256 }; - - char i[(bool) 0.5 == true ? 1 : -1]; - char j[(bool) 0.0 == false ? 1 : -1]; - char k[sizeof (bool) > 0 ? 1 : -1]; - - struct sb { bool s: 1; bool t; } s; - char l[sizeof s.t > 0 ? 1 : -1]; + struct s { _Bool s: 1; _Bool t; } s; + + char a[true == 1 ? 1 : -1]; + char b[false == 0 ? 1 : -1]; + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; + char d[(bool) 0.5 == true ? 1 : -1]; + /* See body of main program for 'e'. */ + char f[(_Bool) 0.0 == false ? 1 : -1]; + char g[true]; + char h[sizeof (_Bool)]; + char i[sizeof s.t]; + enum { j = false, k = true, l = false * true, m = true * 256 }; /* The following fails for HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - bool m[h]; - char n[sizeof m == h * sizeof m[0] ? 1 : -1]; - char o[-1 - (bool) 0 < 0 ? 1 : -1]; + _Bool n[m]; + char o[sizeof n == m * sizeof n[0] ? 1 : -1]; + char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; /* Catch a bug in an HP-UX C compiler. See - https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - https://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html */ - bool p = true; - bool *pp = &p; - - /* C 1999 specifies that bool, true, and false are to be - macros, but C++ 2011 and later overrule this. */ - #if __cplusplus < 201103 - #ifndef bool - #error "bool is not defined" - #endif - #ifndef false - #error "false is not defined" - #endif - #ifndef true - #error "true is not defined" - #endif - #endif - - /* If _Bool is available, repeat with it all the tests - above that used bool. */ - #ifdef HAVE__BOOL - struct sB { _Bool s: 1; _Bool t; } t; - - char q[(_Bool) 0.5 == true ? 1 : -1]; - char r[(_Bool) 0.0 == false ? 1 : -1]; - char u[sizeof (_Bool) > 0 ? 1 : -1]; - char v[sizeof t.t > 0 ? 1 : -1]; - - _Bool w[h]; - char x[sizeof m == h * sizeof m[0] ? 1 : -1]; - char y[-1 - (_Bool) 0 < 0 ? 1 : -1]; - _Bool z = true; - _Bool *pz = &p; - #endif + _Bool q = true; + _Bool *pq = &q; int -main (void) +main () { - bool ps = &s; - *pp |= p; - *pp |= ! p; - - #ifdef HAVE__BOOL - _Bool pt = &t; - *pz |= z; - *pz |= ! z; - #endif - - /* Refer to every declared value, so they cannot be - discarded as unused. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !j + !k - + !l + !m + !n + !o + !p + !pp + !ps - #ifdef HAVE__BOOL - + !q + !r + !u + !v + !w + !x + !y + !z + !pt - #endif - ); + bool e = &s; + *pq |= q; + *pq |= ! q; + /* Refer to every declared value, to avoid compiler optimizations. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l + + !m + !n + !o + !p + !q + !pq); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdbool_h=yes -else $as_nop +else ac_cv_header_stdbool_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 +$as_echo "$ac_cv_header_stdbool_h" >&6; } + ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" +if test "x$ac_cv_type__Bool" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE__BOOL 1 +_ACEOF + + fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 -printf "%s\n" "$ac_cv_header_stdbool_h" >&6; } -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -printf %s "checking for inline... " >&6; } -if test ${ac_cv_c_inline+y} -then : - printf %s "(cached) " >&6 -else $as_nop + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +$as_echo_n "checking for inline... " >&6; } +if ${ac_cv_c_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __cplusplus typedef int foo_t; -static $ac_kw foo_t static_foo (void) {return 0; } -$ac_kw foo_t foo (void) {return 0; } +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } #endif _ACEOF -if ac_fn_c_try_compile "$LINENO" -then : +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_c_inline=$ac_kw fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext test "$ac_cv_c_inline" != no && break done fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -printf "%s\n" "$ac_cv_c_inline" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +$as_echo "$ac_cv_c_inline" >&6; } case $ac_cv_c_inline in inline | yes) ;; @@ -9797,7 +8792,9 @@ case $ac_cv_c_int16_t in #( no|yes) ;; #( *) -printf "%s\n" "#define int16_t $ac_cv_c_int16_t" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define int16_t $ac_cv_c_int16_t +_ACEOF ;; esac @@ -9806,7 +8803,9 @@ case $ac_cv_c_int32_t in #( no|yes) ;; #( *) -printf "%s\n" "#define int32_t $ac_cv_c_int32_t" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define int32_t $ac_cv_c_int32_t +_ACEOF ;; esac @@ -9815,27 +8814,31 @@ case $ac_cv_c_int8_t in #( no|yes) ;; #( *) -printf "%s\n" "#define int8_t $ac_cv_c_int8_t" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define int8_t $ac_cv_c_int8_t +_ACEOF ;; esac ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" -if test "x$ac_cv_type_off_t" = xyes -then : +if test "x$ac_cv_type_off_t" = xyes; then : -else $as_nop +else -printf "%s\n" "#define off_t long int" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define off_t long int +_ACEOF fi ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = xyes -then : +if test "x$ac_cv_type_size_t" = xyes; then : -else $as_nop +else -printf "%s\n" "#define size_t unsigned int" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int +_ACEOF fi @@ -9845,7 +8848,9 @@ case $ac_cv_c_uint16_t in #( *) -printf "%s\n" "#define uint16_t $ac_cv_c_uint16_t" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define uint16_t $ac_cv_c_uint16_t +_ACEOF ;; esac @@ -9854,10 +8859,12 @@ case $ac_cv_c_uint32_t in #( no|yes) ;; #( *) -printf "%s\n" "#define _UINT32_T 1" >>confdefs.h +$as_echo "#define _UINT32_T 1" >>confdefs.h -printf "%s\n" "#define uint32_t $ac_cv_c_uint32_t" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define uint32_t $ac_cv_c_uint32_t +_ACEOF ;; esac @@ -9866,44 +8873,44 @@ case $ac_cv_c_uint8_t in #( no|yes) ;; #( *) -printf "%s\n" "#define _UINT8_T 1" >>confdefs.h +$as_echo "#define _UINT8_T 1" >>confdefs.h -printf "%s\n" "#define uint8_t $ac_cv_c_uint8_t" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define uint8_t $ac_cv_c_uint8_t +_ACEOF ;; esac # Checks for library functions. -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 -printf %s "checking for error_at_line... " >&6; } -if test ${ac_cv_lib_error_at_line+y} -then : - printf %s "(cached) " >&6 -else $as_nop +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 +$as_echo_n "checking for error_at_line... " >&6; } +if ${ac_cv_lib_error_at_line+:} false; then : + $as_echo_n "(cached) " >&6 +else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main (void) +main () { error_at_line (0, 0, "", 0, "an error occurred"); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO" -then : +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_error_at_line=yes -else $as_nop +else ac_cv_lib_error_at_line=no fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ +rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 -printf "%s\n" "$ac_cv_lib_error_at_line" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 +$as_echo "$ac_cv_lib_error_at_line" >&6; } if test $ac_cv_lib_error_at_line = no; then case " $LIBOBJS " in *" error.$ac_objext "* ) ;; @@ -9915,114 +8922,17 @@ fi # AC_FUNC_MALLOC # AC_FUNC_REALLOC -ac_fn_c_check_func "$LINENO" "dup2" "ac_cv_func_dup2" -if test "x$ac_cv_func_dup2" = xyes -then : - printf "%s\n" "#define HAVE_DUP2 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "floor" "ac_cv_func_floor" -if test "x$ac_cv_func_floor" = xyes -then : - printf "%s\n" "#define HAVE_FLOOR 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "gethostname" "ac_cv_func_gethostname" -if test "x$ac_cv_func_gethostname" = xyes -then : - printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "memset" "ac_cv_func_memset" -if test "x$ac_cv_func_memset" = xyes -then : - printf "%s\n" "#define HAVE_MEMSET 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "mkdir" "ac_cv_func_mkdir" -if test "x$ac_cv_func_mkdir" = xyes -then : - printf "%s\n" "#define HAVE_MKDIR 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow" -if test "x$ac_cv_func_pow" = xyes -then : - printf "%s\n" "#define HAVE_POW 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "regcomp" "ac_cv_func_regcomp" -if test "x$ac_cv_func_regcomp" = xyes -then : - printf "%s\n" "#define HAVE_REGCOMP 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "select" "ac_cv_func_select" -if test "x$ac_cv_func_select" = xyes -then : - printf "%s\n" "#define HAVE_SELECT 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "setenv" "ac_cv_func_setenv" -if test "x$ac_cv_func_setenv" = xyes -then : - printf "%s\n" "#define HAVE_SETENV 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "sqrt" "ac_cv_func_sqrt" -if test "x$ac_cv_func_sqrt" = xyes -then : - printf "%s\n" "#define HAVE_SQRT 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" -if test "x$ac_cv_func_strcasecmp" = xyes -then : - printf "%s\n" "#define HAVE_STRCASECMP 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "strchr" "ac_cv_func_strchr" -if test "x$ac_cv_func_strchr" = xyes -then : - printf "%s\n" "#define HAVE_STRCHR 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "strcspn" "ac_cv_func_strcspn" -if test "x$ac_cv_func_strcspn" = xyes -then : - printf "%s\n" "#define HAVE_STRCSPN 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror" -if test "x$ac_cv_func_strerror" = xyes -then : - printf "%s\n" "#define HAVE_STRERROR 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp" -if test "x$ac_cv_func_strncasecmp" = xyes -then : - printf "%s\n" "#define HAVE_STRNCASECMP 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "strrchr" "ac_cv_func_strrchr" -if test "x$ac_cv_func_strrchr" = xyes -then : - printf "%s\n" "#define HAVE_STRRCHR 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "strstr" "ac_cv_func_strstr" -if test "x$ac_cv_func_strstr" = xyes -then : - printf "%s\n" "#define HAVE_STRSTR 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "isatty" "ac_cv_func_isatty" -if test "x$ac_cv_func_isatty" = xyes -then : - printf "%s\n" "#define HAVE_ISATTY 1" >>confdefs.h +for ac_func in dup2 floor gethostname memset mkdir pow regcomp select setenv sqrt strcasecmp strchr strcspn strerror strncasecmp strrchr strstr isatty +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF fi +done @@ -10124,8 +9034,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -10155,15 +9065,15 @@ printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -printf "%s\n" "$as_me: updating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -10177,8 +9087,8 @@ printf "%s\n" "$as_me: updating cache $cache_file" >&6;} fi fi else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -10195,7 +9105,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -10206,14 +9116,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 -printf %s "checking that generated files are newer than configure... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } if test -n "$am_sleep_pid"; then # Hide warnings about reused PIDs. wait $am_sleep_pid 2>/dev/null fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 -printf "%s\n" "done" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -10387,8 +9297,8 @@ fi ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -10411,16 +9321,14 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -as_nop=: -if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 -then : +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else $as_nop +else case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -10430,46 +9338,46 @@ esac fi - -# Reset variables that may have inherited troublesome values from -# the environment. - -# IFS needs to be set, to space, tab, and newline, in precisely that order. -# (If _AS_PATH_WALK were called with IFS unset, it would have the -# side effect of setting IFS to empty, thus disabling word splitting.) -# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -IFS=" "" $as_nl" - -PS1='$ ' -PS2='> ' -PS4='+ ' - -# Ensure predictable behavior from utilities with locale-dependent output. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# We cannot yet rely on "unset" to work, but we need these variables -# to be unset--not just set to an empty or harmless value--now, to -# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct -# also avoids known problems related to "unset" and subshell syntax -# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). -for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH -do eval test \${$as_var+y} \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done - -# Ensure that fds 0, 1, and 2 are open. -if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi -if (exec 3>&2) ; then :; else exec 2>/dev/null; fi +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in #( + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi # The user is always right. -if ${PATH_SEPARATOR+false} :; then +if test "${PATH_SEPARATOR+set}" != set; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -10478,6 +9386,13 @@ if ${PATH_SEPARATOR+false} :; then fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +IFS=" "" $as_nl" + # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -10486,12 +9401,8 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - case $as_dir in #((( - '') as_dir=./ ;; - */) ;; - *) as_dir=$as_dir/ ;; - esac - test -r "$as_dir$0" && as_myself=$as_dir$0 && break + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break done IFS=$as_save_IFS @@ -10503,10 +9414,30 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -10519,14 +9450,13 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - printf "%s\n" "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error - # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -10553,20 +9483,18 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset - # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null -then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : eval 'as_fn_append () { eval $1+=\$2 }' -else $as_nop +else as_fn_append () { eval $1=\$$1\$2 @@ -10578,13 +9506,12 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null -then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else $as_nop +else as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -10615,7 +9542,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -10637,10 +9564,6 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits - -# Determine whether it's possible to make 'echo' print without a newline. -# These variables are no longer used directly by Autoconf, but are AC_SUBSTed -# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -10654,12 +9577,6 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac -# For backward compatibility with old third-party macros, we provide -# the shell variables $as_echo and $as_echo_n. New code should use -# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. -as_echo='printf %s\n' -as_echo_n='printf %s' - rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -10701,7 +9618,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -10710,7 +9627,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -10773,7 +9690,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by MET $as_me development, which was -generated by GNU Autoconf 2.71. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -10836,16 +9753,14 @@ Report bugs to . MET home page: ." _ACEOF -ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` -ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config='$ac_cs_config_escaped' +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ MET config.status development -configured by $0, generated by GNU Autoconf 2.71, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2021 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -10885,15 +9800,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - printf "%s\n" "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - printf "%s\n" "$ac_cs_config"; exit ;; + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -10901,7 +9816,7 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -10910,7 +9825,7 @@ do as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - printf "%s\n" "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -10938,7 +9853,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -10952,7 +9867,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - printf "%s\n" "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF @@ -11119,9 +10034,9 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files - test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers - test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree @@ -11457,7 +10372,7 @@ do esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -11465,17 +10380,17 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -printf "%s\n" "$as_me: creating $ac_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`printf "%s\n" "$configure_input" | + ac_sed_conf_input=`$as_echo "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -11492,7 +10407,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$ac_file" | +$as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -11516,9 +10431,9 @@ printf "%s\n" X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -11580,8 +10495,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -11625,9 +10540,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -11643,20 +10558,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} # if test x"$ac_file" != x-; then { - printf "%s\n" "/* $configure_input */" >&1 \ + $as_echo "/* $configure_input */" \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - printf "%s\n" "/* $configure_input */" >&1 \ + $as_echo "/* $configure_input */" \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi @@ -11676,7 +10591,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$_am_arg" : 'X\(//\)[^/]' \| \ X"$_am_arg" : 'X\(//\)$' \| \ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$_am_arg" | +$as_echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -11696,8 +10611,8 @@ printf "%s\n" X"$_am_arg" | s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -printf "%s\n" "$as_me: executing $ac_file commands" >&6;} + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -11723,7 +10638,7 @@ esac for am_mf do # Strip MF so we end up with the name of the file. - am_mf=`printf "%s\n" "$am_mf" | sed -e 's/:.*$//'` + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile which includes # dependency-tracking related rules and includes. # Grep'ing the whole file directly is not great: AIX grep has a line @@ -11735,7 +10650,7 @@ $as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$am_mf" : 'X\(//\)[^/]' \| \ X"$am_mf" : 'X\(//\)$' \| \ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X"$am_mf" | +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -11757,7 +10672,7 @@ printf "%s\n" X"$am_mf" | $as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ X"$am_mf" : 'X\(//\)$' \| \ X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -printf "%s\n" X/"$am_mf" | +$as_echo X/"$am_mf" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -11782,12 +10697,10 @@ printf "%s\n" X/"$am_mf" | (exit $ac_status); } || am_rc=$? done if test $am_rc -ne 0; then - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. If GNU make was not used, consider - re-running the configure script with MAKE=\"gmake\" (or whatever is - necessary). You can also try re-running configure with the + for automatic dependency tracking. Try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } @@ -11833,8 +10746,7 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi - diff --git a/data/Makefile.in b/data/Makefile.in index 262e9e43cc..56458f3bcc 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,6 +179,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -218,9 +220,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -230,12 +231,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -538,6 +540,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/climo/Makefile.in b/data/climo/Makefile.in index c6415ac06c..5641a76c7c 100644 --- a/data/climo/Makefile.in +++ b/data/climo/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -149,6 +149,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -188,9 +190,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -200,12 +201,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -469,6 +471,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/climo/seeps/Makefile.in b/data/climo/seeps/Makefile.in index 761a867e6b..c771ae02f6 100644 --- a/data/climo/seeps/Makefile.in +++ b/data/climo/seeps/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,9 +160,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -172,12 +171,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -372,6 +372,7 @@ ctags CTAGS: cscope cscopelist: + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/colortables/Makefile.in b/data/colortables/Makefile.in index 82b6b46710..f8660cbeb4 100644 --- a/data/colortables/Makefile.in +++ b/data/colortables/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,6 +179,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -218,9 +220,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -230,12 +231,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -532,6 +534,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/colortables/NCL_colortables/Makefile.in b/data/colortables/NCL_colortables/Makefile.in index df79826d8d..fbc242380d 100644 --- a/data/colortables/NCL_colortables/Makefile.in +++ b/data/colortables/NCL_colortables/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,9 +160,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -172,12 +171,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -641,6 +641,7 @@ ctags CTAGS: cscope cscopelist: + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/config/Makefile.in b/data/config/Makefile.in index e88150a766..6bfe852a86 100644 --- a/data/config/Makefile.in +++ b/data/config/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,9 +160,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -172,12 +171,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -403,6 +403,7 @@ ctags CTAGS: cscope cscopelist: + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/map/Makefile.in b/data/map/Makefile.in index a34c9c189f..691c139de5 100644 --- a/data/map/Makefile.in +++ b/data/map/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,8 +179,10 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) -am__DIST_COMMON = $(srcdir)/Makefile.in README.md +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -218,9 +220,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -230,12 +231,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -522,6 +524,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/map/admin_by_country/Makefile.in b/data/map/admin_by_country/Makefile.in index 3f36ae61fb..c9fa509819 100644 --- a/data/map/admin_by_country/Makefile.in +++ b/data/map/admin_by_country/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,9 +160,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -172,12 +171,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -370,6 +370,7 @@ ctags CTAGS: cscope cscopelist: + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/poly/HMT_masks/Makefile.in b/data/poly/HMT_masks/Makefile.in index 7284d8de7d..87929e2678 100644 --- a/data/poly/HMT_masks/Makefile.in +++ b/data/poly/HMT_masks/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,9 +160,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -172,12 +171,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -377,6 +377,7 @@ ctags CTAGS: cscope cscopelist: + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/poly/Makefile.in b/data/poly/Makefile.in index 36890cca0a..c9e5c28e1d 100644 --- a/data/poly/Makefile.in +++ b/data/poly/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,6 +179,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -218,9 +220,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -230,12 +231,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -557,6 +559,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/poly/NCEP_masks/Makefile.in b/data/poly/NCEP_masks/Makefile.in index acda936d43..2e7afeee4d 100644 --- a/data/poly/NCEP_masks/Makefile.in +++ b/data/poly/NCEP_masks/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,9 +160,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -172,12 +171,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -405,6 +405,7 @@ ctags CTAGS: cscope cscopelist: + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/ps/Makefile.in b/data/ps/Makefile.in index c017420485..a2b64a0966 100644 --- a/data/ps/Makefile.in +++ b/data/ps/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,9 +160,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -172,12 +171,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -405,6 +405,7 @@ ctags CTAGS: cscope cscopelist: + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/table_files/Makefile.in b/data/table_files/Makefile.in index 08d91b866e..cd6b7c6c19 100644 --- a/data/table_files/Makefile.in +++ b/data/table_files/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,9 +160,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -172,12 +171,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -450,6 +450,7 @@ ctags CTAGS: cscope cscopelist: + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/data/tc_data/Makefile.in b/data/tc_data/Makefile.in index 1057808c31..89aa958dac 100644 --- a/data/tc_data/Makefile.in +++ b/data/tc_data/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,9 +160,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -172,12 +171,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -378,6 +378,7 @@ ctags CTAGS: cscope cscopelist: + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/Makefile.in b/internal/test_util/Makefile.in index 91fbb38a04..bc92682f01 100644 --- a/internal/test_util/Makefile.in +++ b/internal/test_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -149,6 +149,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -188,9 +190,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -200,12 +201,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -471,6 +473,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/basic/Makefile.in b/internal/test_util/basic/Makefile.in index 8f7a6ae5f5..59c1c2a6e1 100644 --- a/internal/test_util/basic/Makefile.in +++ b/internal/test_util/basic/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -149,6 +149,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -188,9 +190,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -200,12 +201,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -471,6 +473,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/basic/vx_config/Makefile.in b/internal/test_util/basic/vx_config/Makefile.in index 259d6dae5e..922e74378d 100644 --- a/internal/test_util/basic/vx_config/Makefile.in +++ b/internal/test_util/basic/vx_config/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -200,6 +200,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -213,9 +215,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -225,12 +226,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -606,6 +608,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/basic/vx_log/Makefile.in b/internal/test_util/basic/vx_log/Makefile.in index 0913f22a00..c77a2ffbee 100644 --- a/internal/test_util/basic/vx_log/Makefile.in +++ b/internal/test_util/basic/vx_log/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -169,6 +169,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -182,9 +184,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -194,12 +195,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -493,6 +495,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/basic/vx_util/Makefile.in b/internal/test_util/basic/vx_util/Makefile.in index d904c45e7a..3a1609dc69 100644 --- a/internal/test_util/basic/vx_util/Makefile.in +++ b/internal/test_util/basic/vx_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -207,6 +207,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -220,9 +222,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -232,12 +233,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -630,6 +632,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/Makefile.in b/internal/test_util/libcode/Makefile.in index d83ed27ca1..c6b112a95a 100644 --- a/internal/test_util/libcode/Makefile.in +++ b/internal/test_util/libcode/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -149,6 +149,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -188,9 +190,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -200,12 +201,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -482,6 +484,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_data2d/Makefile.in b/internal/test_util/libcode/vx_data2d/Makefile.in index f659f7c81a..36d61ebc9b 100644 --- a/internal/test_util/libcode/vx_data2d/Makefile.in +++ b/internal/test_util/libcode/vx_data2d/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -175,6 +175,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -188,9 +190,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -200,12 +201,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -521,6 +523,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_data2d_factory/Makefile.in b/internal/test_util/libcode/vx_data2d_factory/Makefile.in index 7964d3fd22..7900d0c3cc 100644 --- a/internal/test_util/libcode/vx_data2d_factory/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_factory/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -173,6 +173,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -186,9 +188,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -198,12 +199,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -529,6 +531,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_data2d_grib/Makefile.in b/internal/test_util/libcode/vx_data2d_grib/Makefile.in index 5591f6439b..0244c37c4a 100644 --- a/internal/test_util/libcode/vx_data2d_grib/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_grib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -166,6 +166,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -179,9 +181,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -191,12 +192,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -480,6 +482,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in index 25fc3da12e..0eeb2004c9 100644 --- a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -167,6 +167,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -180,9 +182,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -192,12 +193,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -482,6 +484,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in index 26689f2e99..f28a17bac3 100644 --- a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -165,6 +165,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -178,9 +180,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -190,12 +191,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -480,6 +482,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_geodesy/Makefile.in b/internal/test_util/libcode/vx_geodesy/Makefile.in index 63e759c489..0755d5d534 100644 --- a/internal/test_util/libcode/vx_geodesy/Makefile.in +++ b/internal/test_util/libcode/vx_geodesy/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -163,6 +163,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -176,9 +178,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -188,12 +189,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -466,6 +468,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_grid/Makefile.in b/internal/test_util/libcode/vx_grid/Makefile.in index 05203d024a..02cf7bebbe 100644 --- a/internal/test_util/libcode/vx_grid/Makefile.in +++ b/internal/test_util/libcode/vx_grid/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -165,6 +165,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -178,9 +180,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -190,12 +191,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -476,6 +478,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_nc_util/Makefile.in b/internal/test_util/libcode/vx_nc_util/Makefile.in index 826e385c3e..71e69f26b0 100644 --- a/internal/test_util/libcode/vx_nc_util/Makefile.in +++ b/internal/test_util/libcode/vx_nc_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -170,6 +170,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,9 +185,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -195,12 +196,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -500,6 +502,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_physics/Makefile.in b/internal/test_util/libcode/vx_physics/Makefile.in index 02f6ef57ae..68d3ee560e 100644 --- a/internal/test_util/libcode/vx_physics/Makefile.in +++ b/internal/test_util/libcode/vx_physics/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -163,6 +163,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -176,9 +178,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -188,12 +189,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -469,6 +471,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_plot_util/Makefile.in b/internal/test_util/libcode/vx_plot_util/Makefile.in index 6a950df3aa..98a7a77776 100644 --- a/internal/test_util/libcode/vx_plot_util/Makefile.in +++ b/internal/test_util/libcode/vx_plot_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -164,6 +164,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -177,9 +179,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -189,12 +190,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -467,6 +469,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_ps/Makefile.in b/internal/test_util/libcode/vx_ps/Makefile.in index d288997194..9496919a41 100644 --- a/internal/test_util/libcode/vx_ps/Makefile.in +++ b/internal/test_util/libcode/vx_ps/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -163,6 +163,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -176,9 +178,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -188,12 +189,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -469,6 +471,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_series_data/Makefile.in b/internal/test_util/libcode/vx_series_data/Makefile.in index 94871489e0..05c70c4afe 100644 --- a/internal/test_util/libcode/vx_series_data/Makefile.in +++ b/internal/test_util/libcode/vx_series_data/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -165,6 +165,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -178,9 +180,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -190,12 +191,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -482,6 +484,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_solar/Makefile.in b/internal/test_util/libcode/vx_solar/Makefile.in index a7026539c3..af88241400 100644 --- a/internal/test_util/libcode/vx_solar/Makefile.in +++ b/internal/test_util/libcode/vx_solar/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -163,6 +163,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -176,9 +178,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -188,12 +189,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -468,6 +470,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/libcode/vx_tc_util/Makefile.in b/internal/test_util/libcode/vx_tc_util/Makefile.in index 9ba04b2a14..79048271fd 100644 --- a/internal/test_util/libcode/vx_tc_util/Makefile.in +++ b/internal/test_util/libcode/vx_tc_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -176,6 +176,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -189,9 +191,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -201,12 +202,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -561,6 +563,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/tools/Makefile.in b/internal/test_util/tools/Makefile.in index e84bca7acf..3cd31f5db4 100644 --- a/internal/test_util/tools/Makefile.in +++ b/internal/test_util/tools/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -149,6 +149,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -188,9 +190,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -200,12 +201,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -468,6 +470,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/tools/other/Makefile.in b/internal/test_util/tools/other/Makefile.in index c054cf412f..b56a3bceb4 100644 --- a/internal/test_util/tools/other/Makefile.in +++ b/internal/test_util/tools/other/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -149,6 +149,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -188,9 +190,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -200,12 +201,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -468,6 +470,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/internal/test_util/tools/other/mode_time_domain/Makefile.in b/internal/test_util/tools/other/mode_time_domain/Makefile.in index 265f29603c..dd54109320 100644 --- a/internal/test_util/tools/other/mode_time_domain/Makefile.in +++ b/internal/test_util/tools/other/mode_time_domain/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -190,6 +190,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -203,9 +205,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -215,12 +216,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -549,6 +551,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/scripts/Rscripts/Makefile.in b/scripts/Rscripts/Makefile.in index fa8e805787..cab0ea2158 100644 --- a/scripts/Rscripts/Makefile.in +++ b/scripts/Rscripts/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,6 +179,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -218,9 +220,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -230,12 +231,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -534,6 +536,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/scripts/Rscripts/include/Makefile.in b/scripts/Rscripts/include/Makefile.in index 5d625c4e28..64c2baebc0 100644 --- a/scripts/Rscripts/include/Makefile.in +++ b/scripts/Rscripts/include/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -160,9 +160,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -172,12 +171,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -376,6 +376,7 @@ ctags CTAGS: cscope cscopelist: + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/scripts/python/Makefile.in b/scripts/python/Makefile.in index e45eb05cd4..cfe87e7680 100644 --- a/scripts/python/Makefile.in +++ b/scripts/python/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -151,6 +151,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -190,9 +192,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -202,12 +203,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -477,6 +479,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/scripts/python/examples/Makefile.in b/scripts/python/examples/Makefile.in index 1d4a58cadf..79ba1b0208 100644 --- a/scripts/python/examples/Makefile.in +++ b/scripts/python/examples/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -162,9 +162,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -174,12 +173,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -380,6 +380,7 @@ ctags CTAGS: cscope cscopelist: + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/scripts/python/met/Makefile.in b/scripts/python/met/Makefile.in index fea84eace6..3e3ad10b4e 100644 --- a/scripts/python/met/Makefile.in +++ b/scripts/python/met/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -162,9 +162,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -174,12 +173,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -377,6 +377,7 @@ ctags CTAGS: cscope cscopelist: + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/scripts/python/pyembed/Makefile.in b/scripts/python/pyembed/Makefile.in index f325661122..58e7354d31 100644 --- a/scripts/python/pyembed/Makefile.in +++ b/scripts/python/pyembed/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,6 +179,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -218,9 +220,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -230,12 +231,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -534,6 +536,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/scripts/python/tc_diag/Makefile.in b/scripts/python/tc_diag/Makefile.in index a7d94424b3..ded1817e9e 100644 --- a/scripts/python/tc_diag/Makefile.in +++ b/scripts/python/tc_diag/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -162,9 +162,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -174,12 +173,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -374,6 +374,7 @@ ctags CTAGS: cscope cscopelist: + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/scripts/python/utility/Makefile.in b/scripts/python/utility/Makefile.in index 4c379b52a6..3bad822147 100644 --- a/scripts/python/utility/Makefile.in +++ b/scripts/python/utility/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -162,9 +162,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -174,12 +173,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -375,6 +375,7 @@ ctags CTAGS: cscope cscopelist: + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/Makefile.in b/src/Makefile.in index 175bb0381a..6579df01d3 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -149,6 +149,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -188,9 +190,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -200,12 +201,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -471,6 +473,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/basic/Makefile.in b/src/basic/Makefile.in index 1df9e615ba..a708dac014 100644 --- a/src/basic/Makefile.in +++ b/src/basic/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -150,6 +150,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = vx_log vx_cal enum_to_string vx_math vx_util \ vx_util_math vx_config am__DIST_COMMON = $(srcdir)/Makefile.in @@ -190,9 +192,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -202,12 +203,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -471,6 +473,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/basic/enum_to_string/Makefile.in b/src/basic/enum_to_string/Makefile.in index 6c1a9607bf..90a93e9f77 100644 --- a/src/basic/enum_to_string/Makefile.in +++ b/src/basic/enum_to_string/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -193,6 +193,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ $(top_srcdir)/ylwrap enum_parser.cc DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -207,9 +209,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -219,12 +220,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -626,6 +628,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/basic/vx_cal/Makefile.in b/src/basic/vx_cal/Makefile.in index a80d944f0a..acd2222de5 100644 --- a/src/basic/vx_cal/Makefile.in +++ b/src/basic/vx_cal/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -201,6 +201,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -214,9 +216,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -226,12 +227,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -680,6 +682,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/basic/vx_config/Makefile.in b/src/basic/vx_config/Makefile.in index 5fddc64397..b031c6087d 100644 --- a/src/basic/vx_config/Makefile.in +++ b/src/basic/vx_config/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -248,6 +248,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ $(top_srcdir)/ylwrap config.tab.cc DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -262,9 +264,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -274,12 +275,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -834,6 +836,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/basic/vx_log/Makefile.in b/src/basic/vx_log/Makefile.in index bfbfb1c4b6..e33739457f 100644 --- a/src/basic/vx_log/Makefile.in +++ b/src/basic/vx_log/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -180,6 +180,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -193,9 +195,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -205,12 +206,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -478,6 +480,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/basic/vx_math/Makefile.in b/src/basic/vx_math/Makefile.in index f42012d3ea..c49c7d80ef 100644 --- a/src/basic/vx_math/Makefile.in +++ b/src/basic/vx_math/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -194,6 +194,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -207,9 +209,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -219,12 +220,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -644,6 +646,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/basic/vx_util/Makefile.in b/src/basic/vx_util/Makefile.in index 83579ba1b4..a887c3c5cb 100644 --- a/src/basic/vx_util/Makefile.in +++ b/src/basic/vx_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -299,6 +299,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -312,9 +314,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -324,12 +325,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -1332,6 +1334,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/basic/vx_util_math/Makefile.in b/src/basic/vx_util_math/Makefile.in index bd06680091..072c3cbdd8 100644 --- a/src/basic/vx_util_math/Makefile.in +++ b/src/basic/vx_util_math/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,6 +179,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -192,9 +194,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -204,12 +205,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -480,6 +482,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/Makefile.in b/src/libcode/Makefile.in index 4af407ca04..c1858ed1c2 100644 --- a/src/libcode/Makefile.in +++ b/src/libcode/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -153,6 +153,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = vx_grid vx_data2d vx_nc_util vx_data2d_grib \ vx_data2d_nc_met vx_data2d_nccf vx_data2d_nc_pinterp \ vx_python3_utils vx_data2d_python vx_pointdata_python \ @@ -200,9 +202,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -212,12 +213,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -487,6 +489,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_afm/Makefile.in b/src/libcode/vx_afm/Makefile.in index 27f3023563..8fff595ef2 100644 --- a/src/libcode/vx_afm/Makefile.in +++ b/src/libcode/vx_afm/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -188,6 +188,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -201,9 +203,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -213,12 +214,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -571,6 +573,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_analysis_util/Makefile.in b/src/libcode/vx_analysis_util/Makefile.in index 10bbb3aea6..88649cb6ce 100644 --- a/src/libcode/vx_analysis_util/Makefile.in +++ b/src/libcode/vx_analysis_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -195,6 +195,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -208,9 +210,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -220,12 +221,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -611,6 +613,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_bool_calc/Makefile.in b/src/libcode/vx_bool_calc/Makefile.in index 07bead994d..d272098a05 100644 --- a/src/libcode/vx_bool_calc/Makefile.in +++ b/src/libcode/vx_bool_calc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -190,6 +190,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -203,9 +205,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -215,12 +216,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -573,6 +575,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_color/Makefile.in b/src/libcode/vx_color/Makefile.in index 08977daff3..1ff8903806 100644 --- a/src/libcode/vx_color/Makefile.in +++ b/src/libcode/vx_color/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -206,6 +206,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ $(top_srcdir)/ylwrap color_parser_yacc.cc DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -220,9 +222,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -232,12 +233,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -592,6 +594,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d/Makefile.in b/src/libcode/vx_data2d/Makefile.in index f3229e9a6a..af4fe623a3 100644 --- a/src/libcode/vx_data2d/Makefile.in +++ b/src/libcode/vx_data2d/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -190,6 +190,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -203,9 +205,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -215,12 +216,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -574,6 +576,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d_factory/Makefile.in b/src/libcode/vx_data2d_factory/Makefile.in index e9254cb32b..f49d5106dd 100644 --- a/src/libcode/vx_data2d_factory/Makefile.in +++ b/src/libcode/vx_data2d_factory/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -193,6 +193,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -206,9 +208,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -218,12 +219,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -593,6 +595,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d_grib/Makefile.in b/src/libcode/vx_data2d_grib/Makefile.in index 684bfa9d81..86eb4b44a2 100644 --- a/src/libcode/vx_data2d_grib/Makefile.in +++ b/src/libcode/vx_data2d_grib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -190,6 +190,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -203,9 +205,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -215,12 +216,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -574,6 +576,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d_grib2/Makefile.in b/src/libcode/vx_data2d_grib2/Makefile.in index e26d1e102b..40965fc98f 100644 --- a/src/libcode/vx_data2d_grib2/Makefile.in +++ b/src/libcode/vx_data2d_grib2/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -183,6 +183,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -196,9 +198,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -208,12 +209,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -502,6 +504,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d_nc_met/Makefile.in b/src/libcode/vx_data2d_nc_met/Makefile.in index e160b86a38..ab84ef720f 100644 --- a/src/libcode/vx_data2d_nc_met/Makefile.in +++ b/src/libcode/vx_data2d_nc_met/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -187,6 +187,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -200,9 +202,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -212,12 +213,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -539,6 +541,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d_nc_pinterp/Makefile.in b/src/libcode/vx_data2d_nc_pinterp/Makefile.in index 867c42b48a..0aa8adbb37 100644 --- a/src/libcode/vx_data2d_nc_pinterp/Makefile.in +++ b/src/libcode/vx_data2d_nc_pinterp/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -188,6 +188,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -201,9 +203,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -213,12 +214,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -540,6 +542,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d_nccf/Makefile.in b/src/libcode/vx_data2d_nccf/Makefile.in index 881177942a..cb619c6f59 100644 --- a/src/libcode/vx_data2d_nccf/Makefile.in +++ b/src/libcode/vx_data2d_nccf/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -184,6 +184,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -197,9 +199,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -209,12 +210,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -520,6 +522,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d_python/Makefile.in b/src/libcode/vx_data2d_python/Makefile.in index cf782561fc..d44514ab1c 100644 --- a/src/libcode/vx_data2d_python/Makefile.in +++ b/src/libcode/vx_data2d_python/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -191,6 +191,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -204,9 +206,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -216,12 +217,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -575,6 +577,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_data2d_ugrid/Makefile.in b/src/libcode/vx_data2d_ugrid/Makefile.in index 7712baafe9..855b5c10a3 100644 --- a/src/libcode/vx_data2d_ugrid/Makefile.in +++ b/src/libcode/vx_data2d_ugrid/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -185,6 +185,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -198,9 +200,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -210,12 +211,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -521,6 +523,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_geodesy/Makefile.in b/src/libcode/vx_geodesy/Makefile.in index 25a281b257..245df2de69 100644 --- a/src/libcode/vx_geodesy/Makefile.in +++ b/src/libcode/vx_geodesy/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,6 +179,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -192,9 +194,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -204,12 +205,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -483,6 +485,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_gis/Makefile.in b/src/libcode/vx_gis/Makefile.in index a382caa1d3..8c7096d7bf 100644 --- a/src/libcode/vx_gis/Makefile.in +++ b/src/libcode/vx_gis/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -188,6 +188,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -201,9 +203,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -213,12 +214,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -574,6 +576,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_gnomon/Makefile.in b/src/libcode/vx_gnomon/Makefile.in index adec4f8fb1..22cdb0cba7 100644 --- a/src/libcode/vx_gnomon/Makefile.in +++ b/src/libcode/vx_gnomon/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,6 +179,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -192,9 +194,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -204,12 +205,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -480,6 +482,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_grid/Makefile.in b/src/libcode/vx_grid/Makefile.in index 99bb769bf1..d2e99030d9 100644 --- a/src/libcode/vx_grid/Makefile.in +++ b/src/libcode/vx_grid/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -221,6 +221,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -234,9 +236,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -246,12 +247,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -742,6 +744,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_gsl_prob/Makefile.in b/src/libcode/vx_gsl_prob/Makefile.in index e3ca39e845..c3af2f99ba 100644 --- a/src/libcode/vx_gsl_prob/Makefile.in +++ b/src/libcode/vx_gsl_prob/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -187,6 +187,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -200,9 +202,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -212,12 +213,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -555,6 +557,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_nav/Makefile.in b/src/libcode/vx_nav/Makefile.in index e91a581ff9..2cf4c7a194 100644 --- a/src/libcode/vx_nav/Makefile.in +++ b/src/libcode/vx_nav/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,6 +179,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -192,9 +194,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -204,12 +205,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -480,6 +482,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_nc_obs/Makefile.in b/src/libcode/vx_nc_obs/Makefile.in index b88b793888..0c2ac95b57 100644 --- a/src/libcode/vx_nc_obs/Makefile.in +++ b/src/libcode/vx_nc_obs/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -189,6 +189,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -202,9 +204,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -214,12 +215,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -572,6 +574,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_nc_util/Makefile.in b/src/libcode/vx_nc_util/Makefile.in index 9843b5647b..28fad97cfb 100644 --- a/src/libcode/vx_nc_util/Makefile.in +++ b/src/libcode/vx_nc_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -187,6 +187,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -200,9 +202,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -212,12 +213,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -556,6 +558,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_pb_util/Makefile.in b/src/libcode/vx_pb_util/Makefile.in index 4155cbd87d..abb2972f9f 100644 --- a/src/libcode/vx_pb_util/Makefile.in +++ b/src/libcode/vx_pb_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -185,6 +185,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -198,9 +200,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -210,12 +211,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -537,6 +539,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_physics/Makefile.in b/src/libcode/vx_physics/Makefile.in index 4a92b393e6..7257818fa1 100644 --- a/src/libcode/vx_physics/Makefile.in +++ b/src/libcode/vx_physics/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,6 +179,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -192,9 +194,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -204,12 +205,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -482,6 +484,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_plot_util/Makefile.in b/src/libcode/vx_plot_util/Makefile.in index b04ac2aff8..4c9ce7ab0f 100644 --- a/src/libcode/vx_plot_util/Makefile.in +++ b/src/libcode/vx_plot_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -184,6 +184,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -197,9 +199,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -209,12 +210,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -519,6 +521,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_pointdata_python/Makefile.in b/src/libcode/vx_pointdata_python/Makefile.in index ef7b4a4c67..5ec0673e42 100644 --- a/src/libcode/vx_pointdata_python/Makefile.in +++ b/src/libcode/vx_pointdata_python/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -188,6 +188,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -201,9 +203,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -213,12 +214,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -539,6 +541,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_ps/Makefile.in b/src/libcode/vx_ps/Makefile.in index 9f1f61d8d9..ddce3ca871 100644 --- a/src/libcode/vx_ps/Makefile.in +++ b/src/libcode/vx_ps/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -189,6 +189,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -202,9 +204,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -214,12 +215,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -572,6 +574,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_pxm/Makefile.in b/src/libcode/vx_pxm/Makefile.in index 9f78c084cc..b57ed344d3 100644 --- a/src/libcode/vx_pxm/Makefile.in +++ b/src/libcode/vx_pxm/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -186,6 +186,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -199,9 +201,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -211,12 +212,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -570,6 +572,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_python3_utils/Makefile.in b/src/libcode/vx_python3_utils/Makefile.in index 625aeafb9a..211b960390 100644 --- a/src/libcode/vx_python3_utils/Makefile.in +++ b/src/libcode/vx_python3_utils/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -191,6 +191,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -204,10 +206,9 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -I../../../src/basic/vx_math \ -I../../../src/basic/vx_cal -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -217,12 +218,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -577,6 +579,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_regrid/Makefile.in b/src/libcode/vx_regrid/Makefile.in index dacbe937e9..fe7777701a 100644 --- a/src/libcode/vx_regrid/Makefile.in +++ b/src/libcode/vx_regrid/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -181,6 +181,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -194,9 +196,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -206,12 +207,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -500,6 +502,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_render/Makefile.in b/src/libcode/vx_render/Makefile.in index 54ad601137..4c9ba687a8 100644 --- a/src/libcode/vx_render/Makefile.in +++ b/src/libcode/vx_render/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -203,6 +203,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -216,9 +218,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -228,12 +229,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -699,6 +701,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_seeps/Makefile.in b/src/libcode/vx_seeps/Makefile.in index 0fabf3df09..a6d931ac2c 100644 --- a/src/libcode/vx_seeps/Makefile.in +++ b/src/libcode/vx_seeps/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,6 +179,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -192,9 +194,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -204,12 +205,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -482,6 +484,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_series_data/Makefile.in b/src/libcode/vx_series_data/Makefile.in index 897d818054..aa11ced76f 100644 --- a/src/libcode/vx_series_data/Makefile.in +++ b/src/libcode/vx_series_data/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -182,6 +182,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -195,9 +197,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -207,12 +208,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -501,6 +503,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_shapedata/Makefile.in b/src/libcode/vx_shapedata/Makefile.in index df218fceda..dace8e7d4c 100644 --- a/src/libcode/vx_shapedata/Makefile.in +++ b/src/libcode/vx_shapedata/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -195,6 +195,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -208,9 +210,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -220,12 +221,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -629,6 +631,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_solar/Makefile.in b/src/libcode/vx_solar/Makefile.in index 3d12890618..d0ddf6578f 100644 --- a/src/libcode/vx_solar/Makefile.in +++ b/src/libcode/vx_solar/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -181,6 +181,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -194,9 +196,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -206,12 +207,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -497,6 +499,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_stat_out/Makefile.in b/src/libcode/vx_stat_out/Makefile.in index d12b414cf1..2042e3b926 100644 --- a/src/libcode/vx_stat_out/Makefile.in +++ b/src/libcode/vx_stat_out/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -181,6 +181,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -194,9 +196,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -206,12 +207,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -501,6 +503,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_statistics/Makefile.in b/src/libcode/vx_statistics/Makefile.in index dbd2500d6a..25ec90833d 100644 --- a/src/libcode/vx_statistics/Makefile.in +++ b/src/libcode/vx_statistics/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -206,6 +206,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -219,9 +221,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -231,12 +232,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -718,6 +720,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_summary/Makefile.in b/src/libcode/vx_summary/Makefile.in index 6c057f2622..02b693c4a8 100644 --- a/src/libcode/vx_summary/Makefile.in +++ b/src/libcode/vx_summary/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -201,6 +201,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -214,9 +216,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -226,12 +227,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -681,6 +683,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_tc_util/Makefile.in b/src/libcode/vx_tc_util/Makefile.in index 747df71532..d91e99e14a 100644 --- a/src/libcode/vx_tc_util/Makefile.in +++ b/src/libcode/vx_tc_util/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -215,6 +215,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -228,9 +230,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -240,12 +241,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -807,6 +809,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/libcode/vx_time_series/Makefile.in b/src/libcode/vx_time_series/Makefile.in index a5eacf5ac7..9b05c1a29a 100644 --- a/src/libcode/vx_time_series/Makefile.in +++ b/src/libcode/vx_time_series/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -183,6 +183,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -196,9 +198,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -208,12 +209,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -503,6 +505,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in index c9b6f05b61..6c7330887a 100644 --- a/src/tools/Makefile.in +++ b/src/tools/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -151,6 +151,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = core other tc_utils dev_utils am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -190,9 +192,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -202,12 +203,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -474,6 +476,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/Makefile.in b/src/tools/core/Makefile.in index 6e18774f39..e9339f56f3 100644 --- a/src/tools/core/Makefile.in +++ b/src/tools/core/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -158,6 +158,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = ensemble_stat grid_stat mode mode_analysis pcp_combine \ point_stat stat_analysis wavelet_stat series_analysis am__DIST_COMMON = $(srcdir)/Makefile.in @@ -198,9 +200,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -210,12 +211,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -480,6 +482,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/ensemble_stat/Makefile.in b/src/tools/core/ensemble_stat/Makefile.in index d2c8c0d798..4587c9c96f 100644 --- a/src/tools/core/ensemble_stat/Makefile.in +++ b/src/tools/core/ensemble_stat/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -170,6 +170,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,9 +185,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -195,12 +196,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -558,6 +560,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/grid_stat/Makefile.in b/src/tools/core/grid_stat/Makefile.in index 2c8b909c39..8a18ac4a53 100644 --- a/src/tools/core/grid_stat/Makefile.in +++ b/src/tools/core/grid_stat/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -169,6 +169,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -182,9 +184,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -194,12 +195,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -557,6 +559,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/mode/Makefile.in b/src/tools/core/mode/Makefile.in index 249a93d1bb..4ccc3994ca 100644 --- a/src/tools/core/mode/Makefile.in +++ b/src/tools/core/mode/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -187,6 +187,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -200,9 +202,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -212,12 +213,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -793,6 +795,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/mode_analysis/Makefile.in b/src/tools/core/mode_analysis/Makefile.in index ce4e7bc477..56aa69e946 100644 --- a/src/tools/core/mode_analysis/Makefile.in +++ b/src/tools/core/mode_analysis/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -170,6 +170,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,9 +185,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -195,12 +196,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -557,6 +559,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/pcp_combine/Makefile.in b/src/tools/core/pcp_combine/Makefile.in index 751ecc5b8a..04429df9bd 100644 --- a/src/tools/core/pcp_combine/Makefile.in +++ b/src/tools/core/pcp_combine/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -167,6 +167,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -180,9 +182,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -192,12 +193,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -529,6 +531,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/point_stat/Makefile.in b/src/tools/core/point_stat/Makefile.in index ccaa3f8e36..4f1c9e1a9e 100644 --- a/src/tools/core/point_stat/Makefile.in +++ b/src/tools/core/point_stat/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -169,6 +169,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -182,9 +184,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -194,12 +195,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -557,6 +559,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/series_analysis/Makefile.in b/src/tools/core/series_analysis/Makefile.in index 9c68f8f191..2e0a6363c8 100644 --- a/src/tools/core/series_analysis/Makefile.in +++ b/src/tools/core/series_analysis/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -171,6 +171,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -184,9 +186,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -196,12 +197,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -559,6 +561,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/stat_analysis/Makefile.in b/src/tools/core/stat_analysis/Makefile.in index 9d0b3c78ea..e28288bb93 100644 --- a/src/tools/core/stat_analysis/Makefile.in +++ b/src/tools/core/stat_analysis/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -176,6 +176,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -189,9 +191,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -201,12 +202,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -618,6 +620,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/core/wavelet_stat/Makefile.in b/src/tools/core/wavelet_stat/Makefile.in index bb37d28807..fa242727a0 100644 --- a/src/tools/core/wavelet_stat/Makefile.in +++ b/src/tools/core/wavelet_stat/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -170,6 +170,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,9 +185,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -195,12 +196,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -564,6 +566,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/dev_utils/Makefile.in b/src/tools/dev_utils/Makefile.in index 5ddb1db20b..d342c2f60b 100644 --- a/src/tools/dev_utils/Makefile.in +++ b/src/tools/dev_utils/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -287,6 +287,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -326,9 +328,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -338,12 +339,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -1022,6 +1024,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/dev_utils/shapefiles/Makefile.in b/src/tools/dev_utils/shapefiles/Makefile.in index f5454f70fb..9550c17c78 100644 --- a/src/tools/dev_utils/shapefiles/Makefile.in +++ b/src/tools/dev_utils/shapefiles/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -164,6 +164,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -177,9 +179,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -189,12 +190,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -510,6 +512,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/Makefile.in b/src/tools/other/Makefile.in index 7574bf3ce1..1f360c8bc5 100644 --- a/src/tools/other/Makefile.in +++ b/src/tools/other/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -167,6 +167,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = gis_utils gen_ens_prod gen_vx_mask plot_data_plane \ plot_point_obs ascii2nc lidar2nc madis2nc pb2nc wwmca_tool \ modis_regrid mode_graphics mode_time_domain gsi_tools \ @@ -210,9 +212,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -222,12 +223,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -495,6 +497,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/ascii2nc/Makefile.in b/src/tools/other/ascii2nc/Makefile.in index 00f20b1511..a74c95cde4 100644 --- a/src/tools/other/ascii2nc/Makefile.in +++ b/src/tools/other/ascii2nc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -214,6 +214,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -227,9 +229,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -239,12 +240,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -775,6 +777,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/gen_ens_prod/Makefile.in b/src/tools/other/gen_ens_prod/Makefile.in index 285f993f59..286a7eb929 100644 --- a/src/tools/other/gen_ens_prod/Makefile.in +++ b/src/tools/other/gen_ens_prod/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -170,6 +170,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,9 +185,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -195,12 +196,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -558,6 +560,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/gen_vx_mask/Makefile.in b/src/tools/other/gen_vx_mask/Makefile.in index 638ca649b7..aca0b6911b 100644 --- a/src/tools/other/gen_vx_mask/Makefile.in +++ b/src/tools/other/gen_vx_mask/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -167,6 +167,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -180,9 +182,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -192,12 +193,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -545,6 +547,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/gis_utils/Makefile.in b/src/tools/other/gis_utils/Makefile.in index aa3780a9bc..a0fc730d36 100644 --- a/src/tools/other/gis_utils/Makefile.in +++ b/src/tools/other/gis_utils/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -179,6 +179,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -192,9 +194,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -204,12 +205,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -581,6 +583,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/grid_diag/Makefile.in b/src/tools/other/grid_diag/Makefile.in index 765eb7ce9c..e2a7bbec83 100644 --- a/src/tools/other/grid_diag/Makefile.in +++ b/src/tools/other/grid_diag/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -169,6 +169,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -182,9 +184,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -194,12 +195,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -556,6 +558,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/gsi_tools/Makefile.in b/src/tools/other/gsi_tools/Makefile.in index 37a6a37ebf..f4cdb30333 100644 --- a/src/tools/other/gsi_tools/Makefile.in +++ b/src/tools/other/gsi_tools/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -206,6 +206,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -219,9 +221,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -231,12 +232,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -813,6 +815,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/ioda2nc/Makefile.in b/src/tools/other/ioda2nc/Makefile.in index a4b16c47aa..ede39d5e37 100644 --- a/src/tools/other/ioda2nc/Makefile.in +++ b/src/tools/other/ioda2nc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -182,6 +182,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -195,9 +197,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -207,12 +208,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -568,6 +570,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/lidar2nc/Makefile.in b/src/tools/other/lidar2nc/Makefile.in index 2f6da2bc07..f4c756bc08 100644 --- a/src/tools/other/lidar2nc/Makefile.in +++ b/src/tools/other/lidar2nc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -182,6 +182,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -195,9 +197,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -207,12 +208,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -595,6 +597,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/madis2nc/Makefile.in b/src/tools/other/madis2nc/Makefile.in index 7055ee7a03..2ce7ad24ce 100644 --- a/src/tools/other/madis2nc/Makefile.in +++ b/src/tools/other/madis2nc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -169,6 +169,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -182,9 +184,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -194,12 +195,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -555,6 +557,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/mode_graphics/Makefile.in b/src/tools/other/mode_graphics/Makefile.in index ead2e5dcb4..ef1c7eedfd 100644 --- a/src/tools/other/mode_graphics/Makefile.in +++ b/src/tools/other/mode_graphics/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -190,6 +190,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -203,9 +205,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -215,12 +216,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -635,6 +637,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/mode_time_domain/Makefile.in b/src/tools/other/mode_time_domain/Makefile.in index 332ca93ac2..2b529ebdfa 100644 --- a/src/tools/other/mode_time_domain/Makefile.in +++ b/src/tools/other/mode_time_domain/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -208,6 +208,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -221,9 +223,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -233,12 +234,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -967,6 +969,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/modis_regrid/Makefile.in b/src/tools/other/modis_regrid/Makefile.in index 65c244e36a..ef69b63ba0 100644 --- a/src/tools/other/modis_regrid/Makefile.in +++ b/src/tools/other/modis_regrid/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -178,6 +178,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -191,9 +193,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -203,12 +204,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -647,6 +649,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/pb2nc/Makefile.in b/src/tools/other/pb2nc/Makefile.in index 06d60500ae..c8ac862943 100644 --- a/src/tools/other/pb2nc/Makefile.in +++ b/src/tools/other/pb2nc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -197,6 +197,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -210,9 +212,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -222,12 +223,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -604,6 +606,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/plot_data_plane/Makefile.in b/src/tools/other/plot_data_plane/Makefile.in index eb0af931e5..468e395d3c 100644 --- a/src/tools/other/plot_data_plane/Makefile.in +++ b/src/tools/other/plot_data_plane/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -169,6 +169,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -182,9 +184,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -194,12 +195,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -538,6 +540,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/plot_point_obs/Makefile.in b/src/tools/other/plot_point_obs/Makefile.in index c5e166b45c..8ec88481fc 100644 --- a/src/tools/other/plot_point_obs/Makefile.in +++ b/src/tools/other/plot_point_obs/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -170,6 +170,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,9 +185,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -195,12 +196,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -562,6 +564,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/point2grid/Makefile.in b/src/tools/other/point2grid/Makefile.in index 35e9722171..490176b6c8 100644 --- a/src/tools/other/point2grid/Makefile.in +++ b/src/tools/other/point2grid/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -181,6 +181,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -194,9 +196,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -206,12 +207,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -562,6 +564,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/regrid_data_plane/Makefile.in b/src/tools/other/regrid_data_plane/Makefile.in index 1cf17714f2..dd9d7bbb36 100644 --- a/src/tools/other/regrid_data_plane/Makefile.in +++ b/src/tools/other/regrid_data_plane/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -170,6 +170,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,9 +185,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -195,12 +196,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -534,6 +536,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/shift_data_plane/Makefile.in b/src/tools/other/shift_data_plane/Makefile.in index 6c53dfcdc4..4f3e9b6df6 100644 --- a/src/tools/other/shift_data_plane/Makefile.in +++ b/src/tools/other/shift_data_plane/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -170,6 +170,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,9 +185,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -195,12 +196,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -534,6 +536,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/other/wwmca_tool/Makefile.in b/src/tools/other/wwmca_tool/Makefile.in index f11d548391..4cbdc459a0 100644 --- a/src/tools/other/wwmca_tool/Makefile.in +++ b/src/tools/other/wwmca_tool/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -230,6 +230,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -243,9 +245,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -255,12 +256,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -998,6 +1000,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/tc_utils/Makefile.in b/src/tools/tc_utils/Makefile.in index 7c74bba2fa..e07ba513ee 100644 --- a/src/tools/tc_utils/Makefile.in +++ b/src/tools/tc_utils/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -150,6 +150,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags DIST_SUBDIRS = tc_dland tc_pairs tc_stat tc_gen tc_rmw rmw_analysis \ tc_diag am__DIST_COMMON = $(srcdir)/Makefile.in @@ -190,9 +192,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -202,12 +203,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -471,6 +473,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.in b/src/tools/tc_utils/rmw_analysis/Makefile.in index 96b646a99a..c6dfed0e53 100644 --- a/src/tools/tc_utils/rmw_analysis/Makefile.in +++ b/src/tools/tc_utils/rmw_analysis/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -170,6 +170,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,9 +185,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -195,12 +196,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -559,6 +561,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/tc_utils/tc_diag/Makefile.in b/src/tools/tc_utils/tc_diag/Makefile.in index 89c097ddb9..bfd080342a 100644 --- a/src/tools/tc_utils/tc_diag/Makefile.in +++ b/src/tools/tc_utils/tc_diag/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -172,6 +172,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -185,9 +187,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -197,12 +198,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -578,6 +580,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/tc_utils/tc_dland/Makefile.in b/src/tools/tc_utils/tc_dland/Makefile.in index 66bc377e52..ac98d5edeb 100644 --- a/src/tools/tc_utils/tc_dland/Makefile.in +++ b/src/tools/tc_utils/tc_dland/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -180,6 +180,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -193,9 +195,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -205,12 +206,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -552,6 +554,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/tc_utils/tc_gen/Makefile.in b/src/tools/tc_utils/tc_gen/Makefile.in index 263c36b038..4d7285f578 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.in +++ b/src/tools/tc_utils/tc_gen/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -170,6 +170,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -183,9 +185,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -195,12 +196,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -563,6 +565,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/tc_utils/tc_pairs/Makefile.in b/src/tools/tc_utils/tc_pairs/Makefile.in index ef0f4a5583..ad4a7aa402 100644 --- a/src/tools/tc_utils/tc_pairs/Makefile.in +++ b/src/tools/tc_utils/tc_pairs/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -194,6 +194,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -207,9 +209,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -219,12 +220,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -593,6 +595,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/tc_utils/tc_rmw/Makefile.in b/src/tools/tc_utils/tc_rmw/Makefile.in index 05d4f518e3..e931541a69 100644 --- a/src/tools/tc_utils/tc_rmw/Makefile.in +++ b/src/tools/tc_utils/tc_rmw/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -172,6 +172,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -185,9 +187,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -197,12 +198,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -577,6 +579,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am diff --git a/src/tools/tc_utils/tc_stat/Makefile.in b/src/tools/tc_utils/tc_stat/Makefile.in index 91e9944932..70ad477f41 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.in +++ b/src/tools/tc_utils/tc_stat/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.5 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2021 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -172,6 +172,8 @@ am__define_uniq_tagged_files = \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -185,9 +187,8 @@ BUFRLIB_NAME = @BUFRLIB_NAME@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CSCOPE = @CSCOPE@ -CTAGS = @CTAGS@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ @@ -197,12 +198,13 @@ DEPDIR = @DEPDIR@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -ETAGS = @ETAGS@ +EGREP = @EGREP@ EXEEXT = @EXEEXT@ F77 = @F77@ FC_LIBS = @FC_LIBS@ FFLAGS = @FFLAGS@ FLIBS = @FLIBS@ +GREP = @GREP@ GRIB2CLIB_NAME = @GRIB2CLIB_NAME@ GRIB2_DEP_LIBS = @GRIB2_DEP_LIBS@ GRIB2_MET_LIBS = @GRIB2_MET_LIBS@ @@ -598,6 +600,7 @@ cscopelist-am: $(am__tagged_files) distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am From ed375244378e58a4c76dda2ef194ee8fd371a4cb Mon Sep 17 00:00:00 2001 From: Howard Soh Date: Thu, 16 Nov 2023 14:34:52 -0700 Subject: [PATCH 109/109] #2231 Initialize n at get_max_n_cov_thresh --- src/tools/core/grid_stat/grid_stat_conf_info.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/core/grid_stat/grid_stat_conf_info.cc b/src/tools/core/grid_stat/grid_stat_conf_info.cc index 9f39e590f5..3a4b717d61 100644 --- a/src/tools/core/grid_stat/grid_stat_conf_info.cc +++ b/src/tools/core/grid_stat/grid_stat_conf_info.cc @@ -516,7 +516,7 @@ int GridStatConfInfo::get_max_n_eclv_points() const { //////////////////////////////////////////////////////////////////////// int GridStatConfInfo::get_max_n_cov_thresh() const { - int n; + int n = 0; for(int i=0; i