From 8cb449576a60aa55303cc9c3b2622997c88e44a1 Mon Sep 17 00:00:00 2001 From: George McCabe <23407799+georgemccabe@users.noreply.github.com> Date: Fri, 13 Jan 2023 14:15:06 -0700 Subject: [PATCH] Feature #2388 Fix Python environment issue (#2407) Co-authored-by: John Halley Gotway --- Makefile.in | 1 + configure | 32 +++++++++++++++++-- configure.ac | 27 ++++++++++++++-- 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 + data/wrappers/Makefile.in | 1 + data/wrappers/set_python_env.py | 1 + data/wrappers/write_tmp_dataplane.py | 4 +++ data/wrappers/write_tmp_mpr.py | 4 +++ data/wrappers/write_tmp_point.py | 4 +++ docs/Users_Guide/appendixF.rst | 4 ++- docs/Users_Guide/installation.rst | 3 +- .../scripts/environment/development.docker | 2 +- .../scripts/environment/development.seneca | 1 + .../scripts/installation/compile_MET_all.sh | 4 +-- internal/test_util/Makefile.in | 1 + internal/test_util/basic/Makefile.in | 1 + .../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 + .../test_util/libcode/vx_data2d/Makefile.in | 1 + .../libcode/vx_data2d_factory/Makefile.in | 1 + .../libcode/vx_data2d_grib/Makefile.in | 1 + .../libcode/vx_data2d_nc_met/Makefile.in | 1 + .../libcode/vx_data2d_nccf/Makefile.in | 1 + .../test_util/libcode/vx_geodesy/Makefile.in | 1 + .../test_util/libcode/vx_grid/Makefile.in | 1 + .../test_util/libcode/vx_nc_util/Makefile.in | 1 + .../test_util/libcode/vx_physics/Makefile.in | 1 + .../libcode/vx_plot_util/Makefile.in | 1 + internal/test_util/libcode/vx_ps/Makefile.in | 1 + .../libcode/vx_series_data/Makefile.in | 1 + .../test_util/libcode/vx_solar/Makefile.in | 1 + .../test_util/libcode/vx_tc_util/Makefile.in | 1 + internal/test_util/tools/Makefile.in | 1 + internal/test_util/tools/other/Makefile.in | 1 + .../tools/other/mode_time_domain/Makefile.in | 1 + scripts/Rscripts/Makefile.in | 1 + scripts/Rscripts/include/Makefile.in | 1 + scripts/python/Makefile.in | 1 + scripts/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/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_factory/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_grid/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_python3_utils/global_python.h | 8 +++++ src/libcode/vx_python3_utils/python3_util.h | 2 ++ 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 + src/tools/Makefile.in | 1 + src/tools/core/Makefile.in | 1 + src/tools/core/ensemble_stat/Makefile.in | 1 + src/tools/core/grid_stat/Makefile.in | 1 + src/tools/core/mode/Makefile.in | 1 + src/tools/core/mode_analysis/Makefile.in | 1 + src/tools/core/pcp_combine/Makefile.in | 1 + src/tools/core/point_stat/Makefile.in | 1 + src/tools/core/series_analysis/Makefile.in | 1 + src/tools/core/stat_analysis/Makefile.in | 1 + src/tools/core/wavelet_stat/Makefile.in | 1 + src/tools/dev_utils/Makefile.in | 1 + src/tools/dev_utils/shapefiles/Makefile.in | 1 + src/tools/other/Makefile.in | 1 + src/tools/other/ascii2nc/Makefile.in | 1 + src/tools/other/gen_ens_prod/Makefile.in | 1 + src/tools/other/gen_vx_mask/Makefile.in | 1 + src/tools/other/gis_utils/Makefile.in | 1 + src/tools/other/grid_diag/Makefile.in | 1 + src/tools/other/gsi_tools/Makefile.in | 1 + src/tools/other/ioda2nc/Makefile.in | 1 + src/tools/other/lidar2nc/Makefile.in | 1 + src/tools/other/madis2nc/Makefile.in | 1 + src/tools/other/mode_graphics/Makefile.in | 1 + src/tools/other/mode_time_domain/Makefile.in | 1 + src/tools/other/modis_regrid/Makefile.in | 1 + src/tools/other/pb2nc/Makefile.in | 1 + src/tools/other/plot_data_plane/Makefile.in | 1 + src/tools/other/plot_point_obs/Makefile.in | 1 + src/tools/other/point2grid/Makefile.in | 1 + src/tools/other/regrid_data_plane/Makefile.in | 1 + src/tools/other/shift_data_plane/Makefile.in | 1 + src/tools/other/wwmca_tool/Makefile.in | 1 + src/tools/tc_utils/Makefile.in | 1 + src/tools/tc_utils/rmw_analysis/Makefile.in | 1 + src/tools/tc_utils/tc_dland/Makefile.in | 1 + src/tools/tc_utils/tc_gen/Makefile.in | 1 + src/tools/tc_utils/tc_pairs/Makefile.in | 1 + src/tools/tc_utils/tc_rmw/Makefile.in | 1 + src/tools/tc_utils/tc_stat/Makefile.in | 1 + 144 files changed, 216 insertions(+), 11 deletions(-) diff --git a/Makefile.in b/Makefile.in index e1277cbbcd..8236187480 100644 --- a/Makefile.in +++ b/Makefile.in @@ -274,6 +274,7 @@ 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@ diff --git a/configure b/configure index cb89948353..d47929b214 100755 --- a/configure +++ b/configure @@ -746,6 +746,7 @@ MET_GSLINC MET_GSL MET_PYTHON_LD MET_PYTHON_CC +MET_PYTHON_BIN_EXE GRIB2CLIB_NAME MET_GRIB2CLIB MET_GRIB2CINC @@ -897,6 +898,7 @@ MET_GRIB2C MET_GRIB2CINC MET_GRIB2CLIB GRIB2CLIB_NAME +MET_PYTHON_BIN_EXE MET_PYTHON_CC MET_PYTHON_LD MET_GSL @@ -1647,13 +1649,16 @@ Some influential environment variables: Name of grib2c library to link with. For example, -lgrib2c_v1.6.0 or -lgrib2c, etc. If it is -lgrib2c, you don't have to specify it. + MET_PYTHON_BIN_EXE + Full path to the python executable corresponding to + MET_PYTHON_CC and MET_PYTHON_LD, e.g. /usr/bin/python3. MET_PYTHON_CC Where the python header files are located, e.g. -I. - Set to the output of 'python-config --cflags'. + Set to the output of 'python3-config --cflags'. MET_PYTHON_LD Where the python library files are located, e.g. -L, followed by the python library names, e.g. -l. Set to - the output of 'python-config --ldflags'. + the output of 'python3-config --ldflags'. MET_GSL Where gsl lib and include subdirectories are located. If they are installed in /usr/local, you don't have to specify them. MET_GSLINC Where gsl include files are located. Use if the libraries and @@ -4648,7 +4653,7 @@ if test -n "$MET_GRIB2CLIB"; then fi # -# Look for the PYTHON library +# Look for the PYTHON executable and library # # Configure the variables. The help text will appear if the user uses "configure --help". @@ -4656,6 +4661,27 @@ fi + +# Ensure that all or none are specified. + +if (test -n "$MET_PYTHON_BIN_EXE" || \ + test -n "$MET_PYTHON_CC" || \ + test -n "$MET_PYTHON_LD"); then + if test -z "$MET_PYTHON_BIN_EXE"; then + as_fn_error $? "MET_PYTHON_CC or MET_PYTHON_LD environment variable set, but MET_PYTHON_BIN_EXE not set. If one of these variables is set, then all must be set." "$LINENO" 5 + elif test -z "$MET_PYTHON_CC"; then + as_fn_error $? "MET_PYTHON_BIN_EXE or MET_PYTHON_LD environment variable set, but MET_PYTHON_CC not set. If one of these variables is set, then all must be set." "$LINENO" 5 + elif test -z "$MET_PYTHON_LD"; then + as_fn_error $? "MET_PYTHON_BIN_EXE or MET_PYTHON_CC environment variable set, but MET_PYTHON_LD not set. If one of these variables is set, then all must be set." "$LINENO" 5 + fi +fi + +# Add MET_PYTHON_BIN_EXE to the CPPFLAGS + +if test -n "$MET_PYTHON_BIN_EXE"; then + CPPFLAGS=$CPPFLAGS' -DMET_PYTHON_BIN_EXE="\"${MET_PYTHON_BIN_EXE}\""' +fi + if test -n "$MET_PYTHON_CC"; then CPPFLAGS="${CPPFLAGS} -I../../basic/vx_log -I../../basic/vx_util ${MET_PYTHON_CC}" fi diff --git a/configure.ac b/configure.ac index efd3aaf7bc..60cc07bcd7 100644 --- a/configure.ac +++ b/configure.ac @@ -155,13 +155,34 @@ if test -n "$MET_GRIB2CLIB"; then fi # -# Look for the PYTHON library +# Look for the PYTHON executable and library # # Configure the variables. The help text will appear if the user uses "configure --help". -AC_ARG_VAR([MET_PYTHON_CC], [Where the python header files are located, e.g. -I. Set to the output of 'python-config --cflags'.]) -AC_ARG_VAR([MET_PYTHON_LD], [Where the python library files are located, e.g. -L, followed by the python library names, e.g. -l. Set to the output of 'python-config --ldflags'.]) +AC_ARG_VAR([MET_PYTHON_BIN_EXE], [Full path to the python executable corresponding to MET_PYTHON_CC and MET_PYTHON_LD, e.g. /usr/bin/python3.]) +AC_ARG_VAR([MET_PYTHON_CC], [Where the python header files are located, e.g. -I. Set to the output of 'python3-config --cflags'.]) +AC_ARG_VAR([MET_PYTHON_LD], [Where the python library files are located, e.g. -L, followed by the python library names, e.g. -l. Set to the output of 'python3-config --ldflags'.]) + +# Ensure that all or none are specified. + +if (test -n "$MET_PYTHON_BIN_EXE" || \ + test -n "$MET_PYTHON_CC" || \ + test -n "$MET_PYTHON_LD"); then + if test -z "$MET_PYTHON_BIN_EXE"; then + AC_MSG_ERROR([MET_PYTHON_CC or MET_PYTHON_LD environment variable set, but MET_PYTHON_BIN_EXE not set. If one of these variables is set, then all must be set.]) + elif test -z "$MET_PYTHON_CC"; then + AC_MSG_ERROR([MET_PYTHON_BIN_EXE or MET_PYTHON_LD environment variable set, but MET_PYTHON_CC not set. If one of these variables is set, then all must be set.]) + elif test -z "$MET_PYTHON_LD"; then + AC_MSG_ERROR([MET_PYTHON_BIN_EXE or MET_PYTHON_CC environment variable set, but MET_PYTHON_LD not set. If one of these variables is set, then all must be set.]) + fi +fi + +# Add MET_PYTHON_BIN_EXE to the CPPFLAGS + +if test -n "$MET_PYTHON_BIN_EXE"; then + CPPFLAGS=$CPPFLAGS' -DMET_PYTHON_BIN_EXE="\"${MET_PYTHON_BIN_EXE}\""' +fi if test -n "$MET_PYTHON_CC"; then CPPFLAGS="${CPPFLAGS} -I../../basic/vx_log -I../../basic/vx_util ${MET_PYTHON_CC}" diff --git a/data/Makefile.in b/data/Makefile.in index 426a2b15bf..acf549d2de 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -279,6 +279,7 @@ 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@ diff --git a/data/climo/Makefile.in b/data/climo/Makefile.in index c612befe6e..9157b38272 100644 --- a/data/climo/Makefile.in +++ b/data/climo/Makefile.in @@ -249,6 +249,7 @@ 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@ diff --git a/data/climo/seeps/Makefile.in b/data/climo/seeps/Makefile.in index 911a2cbb2b..e8ef783b4d 100644 --- a/data/climo/seeps/Makefile.in +++ b/data/climo/seeps/Makefile.in @@ -219,6 +219,7 @@ 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@ diff --git a/data/colortables/Makefile.in b/data/colortables/Makefile.in index a077ec500b..7c1f6997b1 100644 --- a/data/colortables/Makefile.in +++ b/data/colortables/Makefile.in @@ -279,6 +279,7 @@ 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@ diff --git a/data/colortables/NCL_colortables/Makefile.in b/data/colortables/NCL_colortables/Makefile.in index fe4f8a028a..831de55b27 100644 --- a/data/colortables/NCL_colortables/Makefile.in +++ b/data/colortables/NCL_colortables/Makefile.in @@ -219,6 +219,7 @@ 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@ diff --git a/data/config/Makefile.in b/data/config/Makefile.in index a9e630c26c..eaad379a8e 100644 --- a/data/config/Makefile.in +++ b/data/config/Makefile.in @@ -219,6 +219,7 @@ 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@ diff --git a/data/map/Makefile.in b/data/map/Makefile.in index 143c083f3b..feec2dd2f7 100644 --- a/data/map/Makefile.in +++ b/data/map/Makefile.in @@ -279,6 +279,7 @@ 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@ diff --git a/data/map/admin_by_country/Makefile.in b/data/map/admin_by_country/Makefile.in index d117a4dc4e..6459056796 100644 --- a/data/map/admin_by_country/Makefile.in +++ b/data/map/admin_by_country/Makefile.in @@ -219,6 +219,7 @@ 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@ diff --git a/data/poly/HMT_masks/Makefile.in b/data/poly/HMT_masks/Makefile.in index 136ff8fad2..efb0ff9e20 100644 --- a/data/poly/HMT_masks/Makefile.in +++ b/data/poly/HMT_masks/Makefile.in @@ -219,6 +219,7 @@ 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@ diff --git a/data/poly/Makefile.in b/data/poly/Makefile.in index 45c5bf74a2..e21a12d8f9 100644 --- a/data/poly/Makefile.in +++ b/data/poly/Makefile.in @@ -279,6 +279,7 @@ 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@ diff --git a/data/poly/NCEP_masks/Makefile.in b/data/poly/NCEP_masks/Makefile.in index db456806ec..59224ac306 100644 --- a/data/poly/NCEP_masks/Makefile.in +++ b/data/poly/NCEP_masks/Makefile.in @@ -219,6 +219,7 @@ 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@ diff --git a/data/ps/Makefile.in b/data/ps/Makefile.in index 0d0f9700f0..e2501d83ba 100644 --- a/data/ps/Makefile.in +++ b/data/ps/Makefile.in @@ -219,6 +219,7 @@ 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@ diff --git a/data/table_files/Makefile.in b/data/table_files/Makefile.in index ed5514f48f..e64044a945 100644 --- a/data/table_files/Makefile.in +++ b/data/table_files/Makefile.in @@ -219,6 +219,7 @@ 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@ diff --git a/data/tc_data/Makefile.in b/data/tc_data/Makefile.in index fa5d0ed638..7fde41b40e 100644 --- a/data/tc_data/Makefile.in +++ b/data/tc_data/Makefile.in @@ -219,6 +219,7 @@ 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@ diff --git a/data/wrappers/Makefile.in b/data/wrappers/Makefile.in index 9ab052cca5..7d69426340 100644 --- a/data/wrappers/Makefile.in +++ b/data/wrappers/Makefile.in @@ -279,6 +279,7 @@ 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@ diff --git a/data/wrappers/set_python_env.py b/data/wrappers/set_python_env.py index 5b6c2743c2..b5eb7d2828 100644 --- a/data/wrappers/set_python_env.py +++ b/data/wrappers/set_python_env.py @@ -7,3 +7,4 @@ import os import sys import numpy as np +print(f'Python executable: {sys.executable}') diff --git a/data/wrappers/write_tmp_dataplane.py b/data/wrappers/write_tmp_dataplane.py index ff254bf978..476d2348c3 100644 --- a/data/wrappers/write_tmp_dataplane.py +++ b/data/wrappers/write_tmp_dataplane.py @@ -21,6 +21,10 @@ pyembed_module_name = sys.argv[2] sys.argv = sys.argv[2:] +# add share/met/python directory to system path to find met_point_obs +sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), + os.pardir, 'python'))) + # append user script dir to system path pyembed_dir, pyembed_file = os.path.split(pyembed_module_name) if pyembed_dir: diff --git a/data/wrappers/write_tmp_mpr.py b/data/wrappers/write_tmp_mpr.py index ed0f4f0675..3eee0379f5 100644 --- a/data/wrappers/write_tmp_mpr.py +++ b/data/wrappers/write_tmp_mpr.py @@ -20,6 +20,10 @@ pyembed_module_name = sys.argv[2] sys.argv = sys.argv[2:] +# add share/met/python directory to system path to find met_point_obs +sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), + os.pardir, 'python'))) + # append user script dir to system path pyembed_dir, pyembed_file = os.path.split(pyembed_module_name) if pyembed_dir: diff --git a/data/wrappers/write_tmp_point.py b/data/wrappers/write_tmp_point.py index b6cecddfbb..916fca5549 100644 --- a/data/wrappers/write_tmp_point.py +++ b/data/wrappers/write_tmp_point.py @@ -20,6 +20,10 @@ pyembed_module_name = sys.argv[2] sys.argv = sys.argv[2:] +# add share/met/python directory to system path to find met_point_obs +sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), + os.pardir, 'python'))) + # append user script dir to system path pyembed_dir, pyembed_file = os.path.split(pyembed_module_name) if pyembed_dir: diff --git a/docs/Users_Guide/appendixF.rst b/docs/Users_Guide/appendixF.rst index 9f37d24374..3a32cc425e 100644 --- a/docs/Users_Guide/appendixF.rst +++ b/docs/Users_Guide/appendixF.rst @@ -16,7 +16,9 @@ In order to use Python embedding, the user's local Python installation must have The local Python installation must also support a minimum set of required packages. The MET build includes some python wrapper scripts to facilitate the passing of data in memory as well as the reading and writing of temporary files. The packages required by those wrapper scripts are **sys, os, argparse, importlib, numpy and netCDF4**. While most of these are standard packages and readily available, numpy and netCDF4 may not be. Users are advised to confirm their availability prior to compiling MET with python embedding support. -In addition to the **configure** option mentioned above, two variables, **MET_PYTHON_CC** and **MET_PYTHON_LD**, must also be set for the configuration process. These may either be set as environment variables or as command line options to **configure**. These constants are passed as compiler command line options when building MET to enable the compiler to find the requisite Python header files and libraries in the user's local filesystem. Fortunately, Python provides a way to set these variables properly. This frees the user from the necessity of having any expert knowledge of the compiling and linking process. Along with the **Python** executable, there should be another executable called **python3-config**, whose output can be used to set these environment variables as follows: +In addition to the **configure** option mentioned above, three variables, **MET_PYTHON_BIN_EXE**, **MET_PYTHON_CC**, and **MET_PYTHON_LD**, must also be set for the configuration process. These may either be set as environment variables or as command line options to **configure**. These constants are passed as compiler command line options when building MET to enable the compiler to find the requisite Python executable, header files, and libraries in the user's local filesystem. Fortunately, Python provides a way to set these variables properly. This frees the user from the necessity of having any expert knowledge of the compiling and linking process. Along with the **Python** executable, there should be another executable called **python3-config**, whose output can be used to set these environment variables as follows: + +• Set **MET_PYTHON_BIN_EXE** to the full path of the desired python executable. • On the command line, run "**python3-config --cflags**". Set the value of **MET_PYTHON_CC** to the output of that command. diff --git a/docs/Users_Guide/installation.rst b/docs/Users_Guide/installation.rst index b6a73a21be..9db4d6993f 100644 --- a/docs/Users_Guide/installation.rst +++ b/docs/Users_Guide/installation.rst @@ -201,10 +201,11 @@ The following environment variables should also be set: * If compiling support for GRIB2, set $MET_GRIB2CINC and $MET_GRIB2CLIB to point to the main GRIB2C directory which contains both the include and library files. These are used instead of $MET_GRIB2C since the main GRIB2C directory does not contain include and lib subdirectories. -* If compiling support for PYTHON, set $MET_PYTHON_CC and $MET_PYTHON_LD to specify the compiler (-I) and linker (-L) flags required for python. Set $MET_PYTHON_CC for the directory containing the "Python.h" header file. Set $MET_PYTHON_LD for the directory containing the python library file and indicate the name of that file. For example: +* If compiling support for PYTHON, set $MET_PYTHON_BIN_EXE to specify the desired python executable to be used. Also set $MET_PYTHON_CC, and $MET_PYTHON_LD to specify the compiler (-I) and linker (-L) flags required for python. Set $MET_PYTHON_CC for the directory containing the "Python.h" header file. Set $MET_PYTHON_LD for the directory containing the python library file and indicate the name of that file. For example: .. code-block:: none + MET_PYTHON_BIN_EXE='/usr/bin/python3.6' MET_PYTHON_CC='-I/usr/include/python3.6' MET_PYTHON_LD='-L/usr/lib/python3.6/config-x86_64-linux-gnu -lpython3.6m' diff --git a/internal/scripts/environment/development.docker b/internal/scripts/environment/development.docker index c6674b231b..363114d1c7 100644 --- a/internal/scripts/environment/development.docker +++ b/internal/scripts/environment/development.docker @@ -23,7 +23,7 @@ export MET_FREETYPEINC=/usr/include/freetype2 export MET_FREETYPELIB=/usr/lib64 export MET_JASPERLIB=/usr/lib64 -export MET_PYTHON=/usr/bin/python3 +export MET_PYTHON_BIN_EXE=/usr/bin/python3 export MET_PYTHON_CC="-I/usr/include/python3.6m" export MET_PYTHON_LD="-L/usr/lib64 -lpython3.6m -lpthread -ldl -lutil -lm" diff --git a/internal/scripts/environment/development.seneca b/internal/scripts/environment/development.seneca index f4b37c5aa1..9565d5e04b 100644 --- a/internal/scripts/environment/development.seneca +++ b/internal/scripts/environment/development.seneca @@ -23,6 +23,7 @@ export MET_JASPER=${MET_DST}/jasper-1.900.1 # For Python 3 in met-9.0 export MET_PYTHON=/usr/local/met-python3 +export MET_PYTHON_BIN_EXE=${MET_PYTHON}/bin/python3.8 export MET_PYTHON_CC="-I${MET_PYTHON}/include/python3.8" export MET_PYTHON_LD="-L${MET_PYTHON}/lib -lpython3.8 -lcrypt -lpthread -ldl -lutil -lm" diff --git a/internal/scripts/installation/compile_MET_all.sh b/internal/scripts/installation/compile_MET_all.sh index d8a5918f2e..830e5c4b6b 100644 --- a/internal/scripts/installation/compile_MET_all.sh +++ b/internal/scripts/installation/compile_MET_all.sh @@ -10,8 +10,7 @@ # and USE_MODULES. # # If compiling support for Python embedding, users will need to -# set MET_PYTHON, MET_PYTHON_CC, and -# MET_PYTHON_LD. +# set MET_PYTHON, MET_PYTHON_BIN_EXE, MET_PYTHON_CC, and MET_PYTHON_LD. # # For a description of these and other variables, visit the MET # downloads page under "Sample Script For Compiling External @@ -821,6 +820,7 @@ if [ $COMPILE_MET -eq 1 ]; then export MET_GSL=${LIB_DIR} fi + export MET_PYTHON_BIN_EXE=${MET_PYTHON_BIN_EXE:=${MET_PYTHON}/bin/python3} export MET_PYTHON_LD=${MET_PYTHON_LD} export MET_PYTHON_CC=${MET_PYTHON_CC} export LDFLAGS="-Wl,--disable-new-dtags" diff --git a/internal/test_util/Makefile.in b/internal/test_util/Makefile.in index 6da5b75dda..333d20944e 100644 --- a/internal/test_util/Makefile.in +++ b/internal/test_util/Makefile.in @@ -249,6 +249,7 @@ 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@ diff --git a/internal/test_util/basic/Makefile.in b/internal/test_util/basic/Makefile.in index a8c4739023..f11b231015 100644 --- a/internal/test_util/basic/Makefile.in +++ b/internal/test_util/basic/Makefile.in @@ -249,6 +249,7 @@ 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@ diff --git a/internal/test_util/basic/vx_config/Makefile.in b/internal/test_util/basic/vx_config/Makefile.in index ed1b6f00cf..15fbe1495e 100644 --- a/internal/test_util/basic/vx_config/Makefile.in +++ b/internal/test_util/basic/vx_config/Makefile.in @@ -274,6 +274,7 @@ 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@ diff --git a/internal/test_util/basic/vx_log/Makefile.in b/internal/test_util/basic/vx_log/Makefile.in index e62f883a2e..b2645f0632 100644 --- a/internal/test_util/basic/vx_log/Makefile.in +++ b/internal/test_util/basic/vx_log/Makefile.in @@ -243,6 +243,7 @@ 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@ diff --git a/internal/test_util/basic/vx_util/Makefile.in b/internal/test_util/basic/vx_util/Makefile.in index 0827617613..927779187f 100644 --- a/internal/test_util/basic/vx_util/Makefile.in +++ b/internal/test_util/basic/vx_util/Makefile.in @@ -279,6 +279,7 @@ 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@ diff --git a/internal/test_util/libcode/Makefile.in b/internal/test_util/libcode/Makefile.in index 851e209354..6eaddab183 100644 --- a/internal/test_util/libcode/Makefile.in +++ b/internal/test_util/libcode/Makefile.in @@ -249,6 +249,7 @@ 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@ diff --git a/internal/test_util/libcode/vx_data2d/Makefile.in b/internal/test_util/libcode/vx_data2d/Makefile.in index 6dbf10dd85..23aaf9a609 100644 --- a/internal/test_util/libcode/vx_data2d/Makefile.in +++ b/internal/test_util/libcode/vx_data2d/Makefile.in @@ -247,6 +247,7 @@ 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@ diff --git a/internal/test_util/libcode/vx_data2d_factory/Makefile.in b/internal/test_util/libcode/vx_data2d_factory/Makefile.in index 902879f0e6..2819f915fd 100644 --- a/internal/test_util/libcode/vx_data2d_factory/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_factory/Makefile.in @@ -245,6 +245,7 @@ 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@ diff --git a/internal/test_util/libcode/vx_data2d_grib/Makefile.in b/internal/test_util/libcode/vx_data2d_grib/Makefile.in index b6eed1a9d1..b5915e8267 100644 --- a/internal/test_util/libcode/vx_data2d_grib/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_grib/Makefile.in @@ -238,6 +238,7 @@ 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@ 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 5593c9c5ee..07eac4f39c 100644 --- a/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nc_met/Makefile.in @@ -239,6 +239,7 @@ 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@ diff --git a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in index 5d9b74d852..0c18295922 100644 --- a/internal/test_util/libcode/vx_data2d_nccf/Makefile.in +++ b/internal/test_util/libcode/vx_data2d_nccf/Makefile.in @@ -237,6 +237,7 @@ 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@ diff --git a/internal/test_util/libcode/vx_geodesy/Makefile.in b/internal/test_util/libcode/vx_geodesy/Makefile.in index 844e4f4090..45a8923ec8 100644 --- a/internal/test_util/libcode/vx_geodesy/Makefile.in +++ b/internal/test_util/libcode/vx_geodesy/Makefile.in @@ -237,6 +237,7 @@ 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@ diff --git a/internal/test_util/libcode/vx_grid/Makefile.in b/internal/test_util/libcode/vx_grid/Makefile.in index e8038cb4c0..df505544ad 100644 --- a/internal/test_util/libcode/vx_grid/Makefile.in +++ b/internal/test_util/libcode/vx_grid/Makefile.in @@ -237,6 +237,7 @@ 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@ diff --git a/internal/test_util/libcode/vx_nc_util/Makefile.in b/internal/test_util/libcode/vx_nc_util/Makefile.in index bc6cf1d1db..59da8f8a92 100644 --- a/internal/test_util/libcode/vx_nc_util/Makefile.in +++ b/internal/test_util/libcode/vx_nc_util/Makefile.in @@ -242,6 +242,7 @@ 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@ diff --git a/internal/test_util/libcode/vx_physics/Makefile.in b/internal/test_util/libcode/vx_physics/Makefile.in index 03f6d974f1..3bbc795eb2 100644 --- a/internal/test_util/libcode/vx_physics/Makefile.in +++ b/internal/test_util/libcode/vx_physics/Makefile.in @@ -237,6 +237,7 @@ 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@ diff --git a/internal/test_util/libcode/vx_plot_util/Makefile.in b/internal/test_util/libcode/vx_plot_util/Makefile.in index 04a2fe1039..fd5faa8f00 100644 --- a/internal/test_util/libcode/vx_plot_util/Makefile.in +++ b/internal/test_util/libcode/vx_plot_util/Makefile.in @@ -238,6 +238,7 @@ 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@ diff --git a/internal/test_util/libcode/vx_ps/Makefile.in b/internal/test_util/libcode/vx_ps/Makefile.in index e2f8ce7ffb..06d19a7bf0 100644 --- a/internal/test_util/libcode/vx_ps/Makefile.in +++ b/internal/test_util/libcode/vx_ps/Makefile.in @@ -237,6 +237,7 @@ 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@ diff --git a/internal/test_util/libcode/vx_series_data/Makefile.in b/internal/test_util/libcode/vx_series_data/Makefile.in index 6dd2865b07..13f34075ba 100644 --- a/internal/test_util/libcode/vx_series_data/Makefile.in +++ b/internal/test_util/libcode/vx_series_data/Makefile.in @@ -239,6 +239,7 @@ 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@ diff --git a/internal/test_util/libcode/vx_solar/Makefile.in b/internal/test_util/libcode/vx_solar/Makefile.in index c410af9ce9..dcd7455458 100644 --- a/internal/test_util/libcode/vx_solar/Makefile.in +++ b/internal/test_util/libcode/vx_solar/Makefile.in @@ -237,6 +237,7 @@ 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@ diff --git a/internal/test_util/libcode/vx_tc_util/Makefile.in b/internal/test_util/libcode/vx_tc_util/Makefile.in index 1d6a17442c..899010b408 100644 --- a/internal/test_util/libcode/vx_tc_util/Makefile.in +++ b/internal/test_util/libcode/vx_tc_util/Makefile.in @@ -247,6 +247,7 @@ 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@ diff --git a/internal/test_util/tools/Makefile.in b/internal/test_util/tools/Makefile.in index 67e36b9f07..f1d2a1f3fe 100644 --- a/internal/test_util/tools/Makefile.in +++ b/internal/test_util/tools/Makefile.in @@ -249,6 +249,7 @@ 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@ diff --git a/internal/test_util/tools/other/Makefile.in b/internal/test_util/tools/other/Makefile.in index 9ed1cf32eb..9599a8dfd5 100644 --- a/internal/test_util/tools/other/Makefile.in +++ b/internal/test_util/tools/other/Makefile.in @@ -249,6 +249,7 @@ 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@ 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 6a57baf133..4b9c136b1b 100644 --- a/internal/test_util/tools/other/mode_time_domain/Makefile.in +++ b/internal/test_util/tools/other/mode_time_domain/Makefile.in @@ -262,6 +262,7 @@ 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@ diff --git a/scripts/Rscripts/Makefile.in b/scripts/Rscripts/Makefile.in index cb53537961..ecfeb05665 100644 --- a/scripts/Rscripts/Makefile.in +++ b/scripts/Rscripts/Makefile.in @@ -279,6 +279,7 @@ 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@ diff --git a/scripts/Rscripts/include/Makefile.in b/scripts/Rscripts/include/Makefile.in index 3962ab2a85..ba65effd91 100644 --- a/scripts/Rscripts/include/Makefile.in +++ b/scripts/Rscripts/include/Makefile.in @@ -219,6 +219,7 @@ 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@ diff --git a/scripts/python/Makefile.in b/scripts/python/Makefile.in index 80da2e8f84..bfcc683427 100644 --- a/scripts/python/Makefile.in +++ b/scripts/python/Makefile.in @@ -221,6 +221,7 @@ 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@ diff --git a/scripts/utility/Makefile.in b/scripts/utility/Makefile.in index c8a3703b34..a515a31201 100644 --- a/scripts/utility/Makefile.in +++ b/scripts/utility/Makefile.in @@ -221,6 +221,7 @@ 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@ diff --git a/src/Makefile.in b/src/Makefile.in index 6e6c718c05..934182add5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -249,6 +249,7 @@ 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@ diff --git a/src/basic/Makefile.in b/src/basic/Makefile.in index b6f34032a8..bf83fcf031 100644 --- a/src/basic/Makefile.in +++ b/src/basic/Makefile.in @@ -251,6 +251,7 @@ 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@ diff --git a/src/basic/enum_to_string/Makefile.in b/src/basic/enum_to_string/Makefile.in index d2f57cb5c7..814fdfda3d 100644 --- a/src/basic/enum_to_string/Makefile.in +++ b/src/basic/enum_to_string/Makefile.in @@ -268,6 +268,7 @@ 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@ diff --git a/src/basic/vx_cal/Makefile.in b/src/basic/vx_cal/Makefile.in index a3292808f4..e3e4399f86 100644 --- a/src/basic/vx_cal/Makefile.in +++ b/src/basic/vx_cal/Makefile.in @@ -275,6 +275,7 @@ 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@ diff --git a/src/basic/vx_config/Makefile.in b/src/basic/vx_config/Makefile.in index 4c152e5961..f4f2a345a5 100644 --- a/src/basic/vx_config/Makefile.in +++ b/src/basic/vx_config/Makefile.in @@ -323,6 +323,7 @@ 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@ diff --git a/src/basic/vx_log/Makefile.in b/src/basic/vx_log/Makefile.in index 64b1b5ccc7..7057cfead1 100644 --- a/src/basic/vx_log/Makefile.in +++ b/src/basic/vx_log/Makefile.in @@ -254,6 +254,7 @@ 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@ diff --git a/src/basic/vx_math/Makefile.in b/src/basic/vx_math/Makefile.in index b99d0c4ebd..267f4e3bb2 100644 --- a/src/basic/vx_math/Makefile.in +++ b/src/basic/vx_math/Makefile.in @@ -268,6 +268,7 @@ 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@ diff --git a/src/basic/vx_util/Makefile.in b/src/basic/vx_util/Makefile.in index 624a71121a..9888ef5d13 100644 --- a/src/basic/vx_util/Makefile.in +++ b/src/basic/vx_util/Makefile.in @@ -373,6 +373,7 @@ 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@ diff --git a/src/basic/vx_util_math/Makefile.in b/src/basic/vx_util_math/Makefile.in index 969d375ad2..db47183f09 100644 --- a/src/basic/vx_util_math/Makefile.in +++ b/src/basic/vx_util_math/Makefile.in @@ -253,6 +253,7 @@ 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@ diff --git a/src/libcode/Makefile.in b/src/libcode/Makefile.in index 631e84600e..f4aa5ac826 100644 --- a/src/libcode/Makefile.in +++ b/src/libcode/Makefile.in @@ -260,6 +260,7 @@ 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@ diff --git a/src/libcode/vx_afm/Makefile.in b/src/libcode/vx_afm/Makefile.in index 70550c8c8a..5f4661b089 100644 --- a/src/libcode/vx_afm/Makefile.in +++ b/src/libcode/vx_afm/Makefile.in @@ -262,6 +262,7 @@ 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@ diff --git a/src/libcode/vx_analysis_util/Makefile.in b/src/libcode/vx_analysis_util/Makefile.in index 7f3ea7e257..ff0b55ec5e 100644 --- a/src/libcode/vx_analysis_util/Makefile.in +++ b/src/libcode/vx_analysis_util/Makefile.in @@ -269,6 +269,7 @@ 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@ diff --git a/src/libcode/vx_bool_calc/Makefile.in b/src/libcode/vx_bool_calc/Makefile.in index 6dbd6f7811..cb58b490a9 100644 --- a/src/libcode/vx_bool_calc/Makefile.in +++ b/src/libcode/vx_bool_calc/Makefile.in @@ -264,6 +264,7 @@ 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@ diff --git a/src/libcode/vx_color/Makefile.in b/src/libcode/vx_color/Makefile.in index 00b1a1a487..74de00208e 100644 --- a/src/libcode/vx_color/Makefile.in +++ b/src/libcode/vx_color/Makefile.in @@ -281,6 +281,7 @@ 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@ diff --git a/src/libcode/vx_data2d/Makefile.in b/src/libcode/vx_data2d/Makefile.in index e961349c9b..708d731dc6 100644 --- a/src/libcode/vx_data2d/Makefile.in +++ b/src/libcode/vx_data2d/Makefile.in @@ -264,6 +264,7 @@ 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@ diff --git a/src/libcode/vx_data2d_factory/Makefile.in b/src/libcode/vx_data2d_factory/Makefile.in index 1d17ebff51..ed3da07481 100644 --- a/src/libcode/vx_data2d_factory/Makefile.in +++ b/src/libcode/vx_data2d_factory/Makefile.in @@ -267,6 +267,7 @@ 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@ diff --git a/src/libcode/vx_data2d_grib/Makefile.in b/src/libcode/vx_data2d_grib/Makefile.in index cfbc007885..df5f23bfe9 100644 --- a/src/libcode/vx_data2d_grib/Makefile.in +++ b/src/libcode/vx_data2d_grib/Makefile.in @@ -264,6 +264,7 @@ 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@ diff --git a/src/libcode/vx_data2d_grib2/Makefile.in b/src/libcode/vx_data2d_grib2/Makefile.in index 11fbfb0aeb..fec9efaa4e 100644 --- a/src/libcode/vx_data2d_grib2/Makefile.in +++ b/src/libcode/vx_data2d_grib2/Makefile.in @@ -257,6 +257,7 @@ 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@ diff --git a/src/libcode/vx_data2d_nc_met/Makefile.in b/src/libcode/vx_data2d_nc_met/Makefile.in index 4c3c5965b5..1548295a50 100644 --- a/src/libcode/vx_data2d_nc_met/Makefile.in +++ b/src/libcode/vx_data2d_nc_met/Makefile.in @@ -261,6 +261,7 @@ 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@ diff --git a/src/libcode/vx_data2d_nc_pinterp/Makefile.in b/src/libcode/vx_data2d_nc_pinterp/Makefile.in index 729aafabde..ac2869fb14 100644 --- a/src/libcode/vx_data2d_nc_pinterp/Makefile.in +++ b/src/libcode/vx_data2d_nc_pinterp/Makefile.in @@ -262,6 +262,7 @@ 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@ diff --git a/src/libcode/vx_data2d_nccf/Makefile.in b/src/libcode/vx_data2d_nccf/Makefile.in index d70230d844..44d23bbc8d 100644 --- a/src/libcode/vx_data2d_nccf/Makefile.in +++ b/src/libcode/vx_data2d_nccf/Makefile.in @@ -258,6 +258,7 @@ 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@ diff --git a/src/libcode/vx_data2d_python/Makefile.in b/src/libcode/vx_data2d_python/Makefile.in index f059f127f7..fdd274cc72 100644 --- a/src/libcode/vx_data2d_python/Makefile.in +++ b/src/libcode/vx_data2d_python/Makefile.in @@ -265,6 +265,7 @@ 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@ diff --git a/src/libcode/vx_geodesy/Makefile.in b/src/libcode/vx_geodesy/Makefile.in index bbabdfb872..3cd3bc8c93 100644 --- a/src/libcode/vx_geodesy/Makefile.in +++ b/src/libcode/vx_geodesy/Makefile.in @@ -253,6 +253,7 @@ 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@ diff --git a/src/libcode/vx_gis/Makefile.in b/src/libcode/vx_gis/Makefile.in index 33f813a774..254974527b 100644 --- a/src/libcode/vx_gis/Makefile.in +++ b/src/libcode/vx_gis/Makefile.in @@ -262,6 +262,7 @@ 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@ diff --git a/src/libcode/vx_gnomon/Makefile.in b/src/libcode/vx_gnomon/Makefile.in index dd2cd0e514..4c5548a7af 100644 --- a/src/libcode/vx_gnomon/Makefile.in +++ b/src/libcode/vx_gnomon/Makefile.in @@ -253,6 +253,7 @@ 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@ diff --git a/src/libcode/vx_grid/Makefile.in b/src/libcode/vx_grid/Makefile.in index 7e60a24082..d0fa2c9af6 100644 --- a/src/libcode/vx_grid/Makefile.in +++ b/src/libcode/vx_grid/Makefile.in @@ -277,6 +277,7 @@ 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@ diff --git a/src/libcode/vx_gsl_prob/Makefile.in b/src/libcode/vx_gsl_prob/Makefile.in index 52a1a3e506..a16c772b92 100644 --- a/src/libcode/vx_gsl_prob/Makefile.in +++ b/src/libcode/vx_gsl_prob/Makefile.in @@ -261,6 +261,7 @@ 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@ diff --git a/src/libcode/vx_nav/Makefile.in b/src/libcode/vx_nav/Makefile.in index d624c55b0c..b3b9073674 100644 --- a/src/libcode/vx_nav/Makefile.in +++ b/src/libcode/vx_nav/Makefile.in @@ -253,6 +253,7 @@ 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@ diff --git a/src/libcode/vx_nc_obs/Makefile.in b/src/libcode/vx_nc_obs/Makefile.in index d0c296409e..fa930a532b 100644 --- a/src/libcode/vx_nc_obs/Makefile.in +++ b/src/libcode/vx_nc_obs/Makefile.in @@ -263,6 +263,7 @@ 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@ diff --git a/src/libcode/vx_nc_util/Makefile.in b/src/libcode/vx_nc_util/Makefile.in index 6966323260..28ab8cb87c 100644 --- a/src/libcode/vx_nc_util/Makefile.in +++ b/src/libcode/vx_nc_util/Makefile.in @@ -261,6 +261,7 @@ 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@ diff --git a/src/libcode/vx_pb_util/Makefile.in b/src/libcode/vx_pb_util/Makefile.in index 4844a7563a..1c858815c0 100644 --- a/src/libcode/vx_pb_util/Makefile.in +++ b/src/libcode/vx_pb_util/Makefile.in @@ -259,6 +259,7 @@ 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@ diff --git a/src/libcode/vx_physics/Makefile.in b/src/libcode/vx_physics/Makefile.in index 08176f1717..186bf1d838 100644 --- a/src/libcode/vx_physics/Makefile.in +++ b/src/libcode/vx_physics/Makefile.in @@ -253,6 +253,7 @@ 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@ diff --git a/src/libcode/vx_plot_util/Makefile.in b/src/libcode/vx_plot_util/Makefile.in index b168a35271..0560b6742a 100644 --- a/src/libcode/vx_plot_util/Makefile.in +++ b/src/libcode/vx_plot_util/Makefile.in @@ -258,6 +258,7 @@ 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@ diff --git a/src/libcode/vx_pointdata_python/Makefile.in b/src/libcode/vx_pointdata_python/Makefile.in index d45f6a82da..a68210285d 100644 --- a/src/libcode/vx_pointdata_python/Makefile.in +++ b/src/libcode/vx_pointdata_python/Makefile.in @@ -260,6 +260,7 @@ 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@ diff --git a/src/libcode/vx_ps/Makefile.in b/src/libcode/vx_ps/Makefile.in index 2839b6a919..4870c08043 100644 --- a/src/libcode/vx_ps/Makefile.in +++ b/src/libcode/vx_ps/Makefile.in @@ -263,6 +263,7 @@ 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@ diff --git a/src/libcode/vx_pxm/Makefile.in b/src/libcode/vx_pxm/Makefile.in index 35f49ed59e..9e4525b171 100644 --- a/src/libcode/vx_pxm/Makefile.in +++ b/src/libcode/vx_pxm/Makefile.in @@ -260,6 +260,7 @@ 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@ diff --git a/src/libcode/vx_python3_utils/Makefile.in b/src/libcode/vx_python3_utils/Makefile.in index a7a5bc74ef..2e2be4096c 100644 --- a/src/libcode/vx_python3_utils/Makefile.in +++ b/src/libcode/vx_python3_utils/Makefile.in @@ -266,6 +266,7 @@ 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@ diff --git a/src/libcode/vx_python3_utils/global_python.h b/src/libcode/vx_python3_utils/global_python.h index ac796d5187..50dbe22986 100644 --- a/src/libcode/vx_python3_utils/global_python.h +++ b/src/libcode/vx_python3_utils/global_python.h @@ -28,6 +28,7 @@ extern "C" { #include "python3_util.h" #include "concat_string.h" +#include "vx_log.h" //////////////////////////////////////////////////////////////////////// @@ -60,6 +61,10 @@ inline void GlobalPython::initialize() if ( ! is_initialized ) { + mlog << Debug(3) << "Initializing python: " << MET_PYTHON_BIN_EXE << "\n"; + + wchar_t *python_path = Py_DecodeLocale(MET_PYTHON_BIN_EXE, NULL); + Py_SetProgramName(python_path); Py_Initialize(); is_initialized = true; @@ -75,6 +80,9 @@ if ( ! is_initialized ) { command << cs_erase << "sys.path.append(\"" << replace_path(wrappers_dir) + << "\");" + << "sys.path.append(\"" + << replace_path(python_dir) << "\")"; run_python_string(command.text()); diff --git a/src/libcode/vx_python3_utils/python3_util.h b/src/libcode/vx_python3_utils/python3_util.h index b1681463c0..9464142566 100644 --- a/src/libcode/vx_python3_utils/python3_util.h +++ b/src/libcode/vx_python3_utils/python3_util.h @@ -30,6 +30,8 @@ static const char user_python_path_env [] = "MET_PYTHON_EXE"; static const char wrappers_dir [] = "MET_BASE/wrappers"; +static const char python_dir [] = "MET_BASE/python"; + //////////////////////////////////////////////////////////////////////// diff --git a/src/libcode/vx_regrid/Makefile.in b/src/libcode/vx_regrid/Makefile.in index b8f5585605..1e1abd9e7e 100644 --- a/src/libcode/vx_regrid/Makefile.in +++ b/src/libcode/vx_regrid/Makefile.in @@ -255,6 +255,7 @@ 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@ diff --git a/src/libcode/vx_render/Makefile.in b/src/libcode/vx_render/Makefile.in index 6ba231977c..46a34c50d2 100644 --- a/src/libcode/vx_render/Makefile.in +++ b/src/libcode/vx_render/Makefile.in @@ -277,6 +277,7 @@ 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@ diff --git a/src/libcode/vx_seeps/Makefile.in b/src/libcode/vx_seeps/Makefile.in index a8801149e5..e4710b5830 100644 --- a/src/libcode/vx_seeps/Makefile.in +++ b/src/libcode/vx_seeps/Makefile.in @@ -253,6 +253,7 @@ 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@ diff --git a/src/libcode/vx_series_data/Makefile.in b/src/libcode/vx_series_data/Makefile.in index 0bccd1843c..91a471ea3c 100644 --- a/src/libcode/vx_series_data/Makefile.in +++ b/src/libcode/vx_series_data/Makefile.in @@ -256,6 +256,7 @@ 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@ diff --git a/src/libcode/vx_shapedata/Makefile.in b/src/libcode/vx_shapedata/Makefile.in index b1401fdc85..16e8a8fda7 100644 --- a/src/libcode/vx_shapedata/Makefile.in +++ b/src/libcode/vx_shapedata/Makefile.in @@ -269,6 +269,7 @@ 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@ diff --git a/src/libcode/vx_solar/Makefile.in b/src/libcode/vx_solar/Makefile.in index 4ad908aec8..e72e1e9f68 100644 --- a/src/libcode/vx_solar/Makefile.in +++ b/src/libcode/vx_solar/Makefile.in @@ -255,6 +255,7 @@ 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@ diff --git a/src/libcode/vx_stat_out/Makefile.in b/src/libcode/vx_stat_out/Makefile.in index 51e4a5d23c..0742054db0 100644 --- a/src/libcode/vx_stat_out/Makefile.in +++ b/src/libcode/vx_stat_out/Makefile.in @@ -255,6 +255,7 @@ 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@ diff --git a/src/libcode/vx_statistics/Makefile.in b/src/libcode/vx_statistics/Makefile.in index 024978f723..ea08eed52f 100644 --- a/src/libcode/vx_statistics/Makefile.in +++ b/src/libcode/vx_statistics/Makefile.in @@ -280,6 +280,7 @@ 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@ diff --git a/src/libcode/vx_summary/Makefile.in b/src/libcode/vx_summary/Makefile.in index 1f3c6e2e39..35ae2159fa 100644 --- a/src/libcode/vx_summary/Makefile.in +++ b/src/libcode/vx_summary/Makefile.in @@ -275,6 +275,7 @@ 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@ diff --git a/src/libcode/vx_tc_util/Makefile.in b/src/libcode/vx_tc_util/Makefile.in index 236c0abd6f..86ec3f0107 100644 --- a/src/libcode/vx_tc_util/Makefile.in +++ b/src/libcode/vx_tc_util/Makefile.in @@ -289,6 +289,7 @@ 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@ diff --git a/src/libcode/vx_time_series/Makefile.in b/src/libcode/vx_time_series/Makefile.in index 5375464040..82b0d7d6f3 100644 --- a/src/libcode/vx_time_series/Makefile.in +++ b/src/libcode/vx_time_series/Makefile.in @@ -257,6 +257,7 @@ 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@ diff --git a/src/tools/Makefile.in b/src/tools/Makefile.in index 2b0e3b9c8b..5b75053efb 100644 --- a/src/tools/Makefile.in +++ b/src/tools/Makefile.in @@ -251,6 +251,7 @@ 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@ diff --git a/src/tools/core/Makefile.in b/src/tools/core/Makefile.in index b0376710ac..ea28f37143 100644 --- a/src/tools/core/Makefile.in +++ b/src/tools/core/Makefile.in @@ -259,6 +259,7 @@ 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@ diff --git a/src/tools/core/ensemble_stat/Makefile.in b/src/tools/core/ensemble_stat/Makefile.in index d65846ec4b..ea646c09c1 100644 --- a/src/tools/core/ensemble_stat/Makefile.in +++ b/src/tools/core/ensemble_stat/Makefile.in @@ -242,6 +242,7 @@ 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@ diff --git a/src/tools/core/grid_stat/Makefile.in b/src/tools/core/grid_stat/Makefile.in index 9cf9df8068..f872e48230 100644 --- a/src/tools/core/grid_stat/Makefile.in +++ b/src/tools/core/grid_stat/Makefile.in @@ -241,6 +241,7 @@ 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@ diff --git a/src/tools/core/mode/Makefile.in b/src/tools/core/mode/Makefile.in index 34488bdbc9..1c94c9cbcb 100644 --- a/src/tools/core/mode/Makefile.in +++ b/src/tools/core/mode/Makefile.in @@ -260,6 +260,7 @@ 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@ diff --git a/src/tools/core/mode_analysis/Makefile.in b/src/tools/core/mode_analysis/Makefile.in index f7f149c327..a1a56d3a9c 100644 --- a/src/tools/core/mode_analysis/Makefile.in +++ b/src/tools/core/mode_analysis/Makefile.in @@ -242,6 +242,7 @@ 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@ diff --git a/src/tools/core/pcp_combine/Makefile.in b/src/tools/core/pcp_combine/Makefile.in index 469664b3a3..24d1d97fb2 100644 --- a/src/tools/core/pcp_combine/Makefile.in +++ b/src/tools/core/pcp_combine/Makefile.in @@ -239,6 +239,7 @@ 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@ diff --git a/src/tools/core/point_stat/Makefile.in b/src/tools/core/point_stat/Makefile.in index 58f5811a41..be6f9f3aa2 100644 --- a/src/tools/core/point_stat/Makefile.in +++ b/src/tools/core/point_stat/Makefile.in @@ -242,6 +242,7 @@ 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@ diff --git a/src/tools/core/series_analysis/Makefile.in b/src/tools/core/series_analysis/Makefile.in index d1e066eae0..2d8ac414ee 100644 --- a/src/tools/core/series_analysis/Makefile.in +++ b/src/tools/core/series_analysis/Makefile.in @@ -243,6 +243,7 @@ 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@ diff --git a/src/tools/core/stat_analysis/Makefile.in b/src/tools/core/stat_analysis/Makefile.in index cf531b2d07..3ea6da1a30 100644 --- a/src/tools/core/stat_analysis/Makefile.in +++ b/src/tools/core/stat_analysis/Makefile.in @@ -248,6 +248,7 @@ 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@ diff --git a/src/tools/core/wavelet_stat/Makefile.in b/src/tools/core/wavelet_stat/Makefile.in index 86f163f0b8..5f78a9200a 100644 --- a/src/tools/core/wavelet_stat/Makefile.in +++ b/src/tools/core/wavelet_stat/Makefile.in @@ -242,6 +242,7 @@ 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@ diff --git a/src/tools/dev_utils/Makefile.in b/src/tools/dev_utils/Makefile.in index 902859fd19..860995c34e 100644 --- a/src/tools/dev_utils/Makefile.in +++ b/src/tools/dev_utils/Makefile.in @@ -385,6 +385,7 @@ 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@ diff --git a/src/tools/dev_utils/shapefiles/Makefile.in b/src/tools/dev_utils/shapefiles/Makefile.in index 41203ec2e4..ca79d9c227 100644 --- a/src/tools/dev_utils/shapefiles/Makefile.in +++ b/src/tools/dev_utils/shapefiles/Makefile.in @@ -238,6 +238,7 @@ 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@ diff --git a/src/tools/other/Makefile.in b/src/tools/other/Makefile.in index 58ed5aacdd..2fe8bcc902 100644 --- a/src/tools/other/Makefile.in +++ b/src/tools/other/Makefile.in @@ -271,6 +271,7 @@ 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@ diff --git a/src/tools/other/ascii2nc/Makefile.in b/src/tools/other/ascii2nc/Makefile.in index c4610b6d10..2c18cd019d 100644 --- a/src/tools/other/ascii2nc/Makefile.in +++ b/src/tools/other/ascii2nc/Makefile.in @@ -287,6 +287,7 @@ 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@ diff --git a/src/tools/other/gen_ens_prod/Makefile.in b/src/tools/other/gen_ens_prod/Makefile.in index a569327ee7..75762ae308 100644 --- a/src/tools/other/gen_ens_prod/Makefile.in +++ b/src/tools/other/gen_ens_prod/Makefile.in @@ -242,6 +242,7 @@ 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@ diff --git a/src/tools/other/gen_vx_mask/Makefile.in b/src/tools/other/gen_vx_mask/Makefile.in index 1b6f49ad05..112c26b3a3 100644 --- a/src/tools/other/gen_vx_mask/Makefile.in +++ b/src/tools/other/gen_vx_mask/Makefile.in @@ -239,6 +239,7 @@ 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@ diff --git a/src/tools/other/gis_utils/Makefile.in b/src/tools/other/gis_utils/Makefile.in index 2612a7c3cc..d40b28e556 100644 --- a/src/tools/other/gis_utils/Makefile.in +++ b/src/tools/other/gis_utils/Makefile.in @@ -253,6 +253,7 @@ 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@ diff --git a/src/tools/other/grid_diag/Makefile.in b/src/tools/other/grid_diag/Makefile.in index e4b4bb8972..3c32c0c4d1 100644 --- a/src/tools/other/grid_diag/Makefile.in +++ b/src/tools/other/grid_diag/Makefile.in @@ -241,6 +241,7 @@ 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@ diff --git a/src/tools/other/gsi_tools/Makefile.in b/src/tools/other/gsi_tools/Makefile.in index f4f846b2c6..45fb7ea8b6 100644 --- a/src/tools/other/gsi_tools/Makefile.in +++ b/src/tools/other/gsi_tools/Makefile.in @@ -277,6 +277,7 @@ 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@ diff --git a/src/tools/other/ioda2nc/Makefile.in b/src/tools/other/ioda2nc/Makefile.in index 833d72a4a4..1d276363af 100644 --- a/src/tools/other/ioda2nc/Makefile.in +++ b/src/tools/other/ioda2nc/Makefile.in @@ -254,6 +254,7 @@ 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@ diff --git a/src/tools/other/lidar2nc/Makefile.in b/src/tools/other/lidar2nc/Makefile.in index 04ae0045bf..fc1473ceb3 100644 --- a/src/tools/other/lidar2nc/Makefile.in +++ b/src/tools/other/lidar2nc/Makefile.in @@ -254,6 +254,7 @@ 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@ diff --git a/src/tools/other/madis2nc/Makefile.in b/src/tools/other/madis2nc/Makefile.in index 94579deef3..388acac988 100644 --- a/src/tools/other/madis2nc/Makefile.in +++ b/src/tools/other/madis2nc/Makefile.in @@ -242,6 +242,7 @@ 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@ diff --git a/src/tools/other/mode_graphics/Makefile.in b/src/tools/other/mode_graphics/Makefile.in index 3b18cedc1e..8f92c53860 100644 --- a/src/tools/other/mode_graphics/Makefile.in +++ b/src/tools/other/mode_graphics/Makefile.in @@ -262,6 +262,7 @@ 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@ diff --git a/src/tools/other/mode_time_domain/Makefile.in b/src/tools/other/mode_time_domain/Makefile.in index 9a321b9805..a98d2fc5b2 100644 --- a/src/tools/other/mode_time_domain/Makefile.in +++ b/src/tools/other/mode_time_domain/Makefile.in @@ -280,6 +280,7 @@ 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@ diff --git a/src/tools/other/modis_regrid/Makefile.in b/src/tools/other/modis_regrid/Makefile.in index a71b4cd8d4..dc660ffd56 100644 --- a/src/tools/other/modis_regrid/Makefile.in +++ b/src/tools/other/modis_regrid/Makefile.in @@ -250,6 +250,7 @@ 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@ diff --git a/src/tools/other/pb2nc/Makefile.in b/src/tools/other/pb2nc/Makefile.in index a8f71ec6b4..57fb246f48 100644 --- a/src/tools/other/pb2nc/Makefile.in +++ b/src/tools/other/pb2nc/Makefile.in @@ -270,6 +270,7 @@ 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@ diff --git a/src/tools/other/plot_data_plane/Makefile.in b/src/tools/other/plot_data_plane/Makefile.in index 69e64aa697..0b343901f1 100644 --- a/src/tools/other/plot_data_plane/Makefile.in +++ b/src/tools/other/plot_data_plane/Makefile.in @@ -241,6 +241,7 @@ 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@ diff --git a/src/tools/other/plot_point_obs/Makefile.in b/src/tools/other/plot_point_obs/Makefile.in index bb6cef27ae..f95166f747 100644 --- a/src/tools/other/plot_point_obs/Makefile.in +++ b/src/tools/other/plot_point_obs/Makefile.in @@ -242,6 +242,7 @@ 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@ diff --git a/src/tools/other/point2grid/Makefile.in b/src/tools/other/point2grid/Makefile.in index a78b4bd269..24fca973b6 100644 --- a/src/tools/other/point2grid/Makefile.in +++ b/src/tools/other/point2grid/Makefile.in @@ -254,6 +254,7 @@ 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@ diff --git a/src/tools/other/regrid_data_plane/Makefile.in b/src/tools/other/regrid_data_plane/Makefile.in index c0cfece3f4..847b6fdc3a 100644 --- a/src/tools/other/regrid_data_plane/Makefile.in +++ b/src/tools/other/regrid_data_plane/Makefile.in @@ -242,6 +242,7 @@ 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@ diff --git a/src/tools/other/shift_data_plane/Makefile.in b/src/tools/other/shift_data_plane/Makefile.in index a151336841..2a25213a86 100644 --- a/src/tools/other/shift_data_plane/Makefile.in +++ b/src/tools/other/shift_data_plane/Makefile.in @@ -242,6 +242,7 @@ 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@ diff --git a/src/tools/other/wwmca_tool/Makefile.in b/src/tools/other/wwmca_tool/Makefile.in index 8790efcea3..c487c252a2 100644 --- a/src/tools/other/wwmca_tool/Makefile.in +++ b/src/tools/other/wwmca_tool/Makefile.in @@ -300,6 +300,7 @@ 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@ diff --git a/src/tools/tc_utils/Makefile.in b/src/tools/tc_utils/Makefile.in index 14e319d00e..97a28db892 100644 --- a/src/tools/tc_utils/Makefile.in +++ b/src/tools/tc_utils/Makefile.in @@ -249,6 +249,7 @@ 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@ diff --git a/src/tools/tc_utils/rmw_analysis/Makefile.in b/src/tools/tc_utils/rmw_analysis/Makefile.in index a6dfaa3dd9..07e9e99ccf 100644 --- a/src/tools/tc_utils/rmw_analysis/Makefile.in +++ b/src/tools/tc_utils/rmw_analysis/Makefile.in @@ -242,6 +242,7 @@ 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@ diff --git a/src/tools/tc_utils/tc_dland/Makefile.in b/src/tools/tc_utils/tc_dland/Makefile.in index 8cb08b78fe..848be3854d 100644 --- a/src/tools/tc_utils/tc_dland/Makefile.in +++ b/src/tools/tc_utils/tc_dland/Makefile.in @@ -253,6 +253,7 @@ 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@ diff --git a/src/tools/tc_utils/tc_gen/Makefile.in b/src/tools/tc_utils/tc_gen/Makefile.in index 35cd8d681e..a59aac542f 100644 --- a/src/tools/tc_utils/tc_gen/Makefile.in +++ b/src/tools/tc_utils/tc_gen/Makefile.in @@ -242,6 +242,7 @@ 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@ diff --git a/src/tools/tc_utils/tc_pairs/Makefile.in b/src/tools/tc_utils/tc_pairs/Makefile.in index 3b34b63f9b..911b9e2465 100644 --- a/src/tools/tc_utils/tc_pairs/Makefile.in +++ b/src/tools/tc_utils/tc_pairs/Makefile.in @@ -266,6 +266,7 @@ 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@ diff --git a/src/tools/tc_utils/tc_rmw/Makefile.in b/src/tools/tc_utils/tc_rmw/Makefile.in index 3a00b9ee32..4a13708c11 100644 --- a/src/tools/tc_utils/tc_rmw/Makefile.in +++ b/src/tools/tc_utils/tc_rmw/Makefile.in @@ -244,6 +244,7 @@ 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@ diff --git a/src/tools/tc_utils/tc_stat/Makefile.in b/src/tools/tc_utils/tc_stat/Makefile.in index 620bbce060..3ec221bf43 100644 --- a/src/tools/tc_utils/tc_stat/Makefile.in +++ b/src/tools/tc_utils/tc_stat/Makefile.in @@ -244,6 +244,7 @@ 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@