add missing option --has_parallel4

This commit is contained in:
Wei-keng Liao 2018-10-02 01:58:21 -05:00
parent 82d7ae2a93
commit cfcf93eda3
2 changed files with 290 additions and 264 deletions

View File

@ -85,6 +85,13 @@ else
has_cdf5="yes"
fi
has_parallel4="@USE_PARALLEL4@"
if [ -z $has_parallel4 ]; then
has_parallel4="no"
else
has_parallel4="yes"
fi
has_parallel="@USE_PARALLEL@"
if [ -z $has_parallel ]; then
has_parallel="no"
@ -135,52 +142,53 @@ Usage: nc-config [OPTION]
Available values for OPTION include:
--help display this help message and exit
--all display all options
--cc C compiler
--cflags pre-processor and compiler flags
--has-c++ whether C++ API is installed
--has-c++4 whether netCDF-4 C++ API is installed
--has-fortran whether Fortran API is installed
--has-dap2 whether OPeNDAP (DAP2) is enabled in this build
--has-dap4 whether DAP4 is enabled in this build
--has-dap same as --has-dap2 (Deprecated)
--has-nc2 whether NetCDF-2 API is enabled
--has-nc4 whether NetCDF-4/HDF-5 is enabled in this build
--has-hdf5 whether HDF5 is used in build (always the same as --has-nc4)
--has-hdf4 whether HDF4 was used in build
--has-logging whether logging is enabled with --enable-logging.
--has-pnetcdf whether PnetCDF was used in build
--has-szlib whether szlib is included in build
--has-parallel whether has parallel IO support via HDF5 and/or PnetCDF
--libs library linking information for netcdf
--prefix Install prefix
--includedir Include directory
--libdir Library directory
--version Library version
--help display this help message and exit
--all display all options
--cc C compiler
--cflags pre-processor and compiler flags
--has-c++ whether C++ API is installed
--has-c++4 whether netCDF-4 C++ API is installed
--has-fortran whether Fortran API is installed
--has-dap2 whether OPeNDAP (DAP2) is enabled in this build
--has-dap4 whether DAP4 is enabled in this build
--has-dap same as --has-dap2 (Deprecated)
--has-nc2 whether NetCDF-2 API is enabled
--has-nc4 whether NetCDF-4/HDF-5 is enabled in this build
--has-hdf5 whether HDF5 is used in build (always the same as --has-nc4)
--has-hdf4 whether HDF4 was used in build
--has-logging whether logging is enabled with --enable-logging.
--has-pnetcdf whether PnetCDF was used in build
--has-szlib whether szlib is included in build
--has-cdf5 whether cdf5 support is included in build
--has-parallel4 whether has parallel IO support via HDF5
--has-parallel whether has parallel IO support via HDF5 or PnetCDF
--libs library linking information for netcdf
--prefix Install prefix
--includedir Include directory
--libdir Library directory
--version Library version
EOF
if [ -f "$ncxx4conf" ]; then
cat <<EOF
--cxx4 C++ compiler for netCDF-4 C++ library
--cxx4flags flags needed to compile a C++ program
--cxx4libs libraries needed to link a C++ program
--cxx4 C++ compiler for netCDF-4 C++ library
--cxx4flags flags needed to compile a C++ program
--cxx4libs libraries needed to link a C++ program
EOF
elif [ -f "$ncxxconf" ]; then
cat <<EOF
--cxx C++ compiler
--cxxflags flags needed to compile a C++ program
--cxxlibs libraries needed to link a C++ program
--cxx C++ compiler
--cxxflags flags needed to compile a C++ program
--cxxlibs libraries needed to link a C++ program
EOF
fi
if [ -f "$nfconf" ]; then
cat <<EOF
--fc Fortran compiler
--fflags flags needed to compile a Fortran program
--flibs libraries needed to link a Fortran program
--has-f90 whether Fortran 90 API is installed
--has-f03 whether Fortran 03 API is installed (implies F90).
--fc Fortran compiler
--fflags flags needed to compile a Fortran program
--flibs libraries needed to link a Fortran program
--has-f90 whether Fortran 90 API is installed
--has-f03 whether Fortran 03 API is installed (implies F90).
EOF
fi
exit $1
@ -191,52 +199,53 @@ all()
echo
echo "This $version has been built with the following features: "
echo
echo " --cc -> $cc"
echo " --cflags -> $cflags"
echo " --libs -> $libs"
echo " --cc -> $cc"
echo " --cflags -> $cflags"
echo " --libs -> $libs"
echo
echo " --has-c++ -> $has_cxx"
echo " --cxx -> $cxx"
echo " --has-c++ -> $has_cxx"
echo " --cxx -> $cxx"
if [ -f "$ncxxconf" ]; then
echo " --cxxflags -> $cxxflags"
echo " --cxxlibs -> $cxxlibs"
echo " --cxxflags -> $cxxflags"
echo " --cxxlibs -> $cxxlibs"
fi
echo
echo " --has-c++4 -> $has_cxx4"
echo " --cxx4 -> $cxx4"
echo " --has-c++4 -> $has_cxx4"
echo " --cxx4 -> $cxx4"
if [ -f "$ncxx4conf" ]; then
echo " --cxx4flags -> $cxx4flags"
echo " --cxx4libs -> $cxx4libs"
echo " --cxx4flags -> $cxx4flags"
echo " --cxx4libs -> $cxx4libs"
fi
echo
echo " --has-fortran-> $has_fortran"
echo " --has-fortran -> $has_fortran"
if [ -f "$nfconf" ]; then
echo " --fc -> $fc"
echo " --fflags -> $fflags"
echo " --flibs -> $flibs"
echo " --has-f90 -> $has_f90"
echo " --has-f03 -> $has_f03"
echo " --fc -> $fc"
echo " --fflags -> $fflags"
echo " --flibs -> $flibs"
echo " --has-f90 -> $has_f90"
echo " --has-f03 -> $has_f03"
echo
fi
echo " --has-dap -> $has_dap2"
echo " --has-dap2 -> $has_dap2"
echo " --has-dap4 -> $has_dap4"
echo " --has-nc2 -> $has_nc2"
echo " --has-nc4 -> $has_nc4"
echo " --has-hdf5 -> $has_hdf5"
echo " --has-hdf4 -> $has_hdf4"
echo " --has-logging-> $has_logging"
echo " --has-pnetcdf-> $has_pnetcdf"
echo " --has-szlib -> $has_szlib"
echo " --has-cdf5 -> $has_cdf5"
echo " --has-parallel-> $has_parallel"
echo
echo " --prefix -> $prefix"
echo " --includedir-> $includedir"
echo " --libdir -> $libdir"
echo " --version -> $version"
echo " --has-dap -> $has_dap2"
echo " --has-dap2 -> $has_dap2"
echo " --has-dap4 -> $has_dap4"
echo " --has-nc2 -> $has_nc2"
echo " --has-nc4 -> $has_nc4"
echo " --has-hdf5 -> $has_hdf5"
echo " --has-hdf4 -> $has_hdf4"
echo " --has-logging -> $has_logging"
echo " --has-pnetcdf -> $has_pnetcdf"
echo " --has-szlib -> $has_szlib"
echo " --has-cdf5 -> $has_cdf5"
echo " --has-parallel4 -> $has_parallel4"
echo " --has-parallel -> $has_parallel"
echo
echo " --prefix -> $prefix"
echo " --includedir -> $includedir"
echo " --libdir -> $libdir"
echo " --version -> $version"
echo
}
@ -256,149 +265,153 @@ while test $# -gt 0; do
case "$1" in
--help)
usage 0
;;
usage 0
;;
--all)
all
;;
all
;;
--cc)
echo $cc
;;
echo $cc
;;
--cflags)
echo $cflags
;;
echo $cflags
;;
--has-dap)
echo $has_dap2
;;
echo $has_dap2
;;
--has-dap2)
echo $has_dap2
;;
echo $has_dap2
;;
--has-dap4)
echo $has_dap4
;;
echo $has_dap4
;;
--has-nc2)
echo $has_nc2
;;
echo $has_nc2
;;
--has-nc4)
echo $has_nc4
;;
echo $has_nc4
;;
--has-hdf5)
echo $has_hdf5
;;
echo $has_hdf5
;;
--has-hdf4)
echo $has_hdf4
;;
echo $has_hdf4
;;
--has-logging)
echo $has_logging
;;
--has-pnetcdf)
echo $has_pnetcdf
;;
echo $has_pnetcdf
;;
--has-szlib)
echo $has_szlib
;;
echo $has_szlib
;;
--has-cdf5)
echo $has_cdf5
;;
--has-parallel4)
echo $has_parallel4
;;
--has-parallel)
echo $has_parallel
;;
echo $has_parallel
;;
--libs)
echo $libs
;;
echo $libs
;;
--prefix)
echo "${prefix}"
;;
echo "${prefix}"
;;
--includedir)
echo "${includedir}"
;;
echo "${includedir}"
;;
--libdir)
echo "${libdir}"
;;
echo "${libdir}"
;;
--version)
echo $version
;;
echo $version
;;
--has-c++)
echo $has_cxx
;;
echo $has_cxx
;;
--cxx)
echo $cxx
;;
echo $cxx
;;
--cxxflags)
echo $cxxflags
;;
echo $cxxflags
;;
--cxxlibs)
echo $cxxlibs
;;
echo $cxxlibs
;;
--has-c++4)
echo $has_cxx4
;;
echo $has_cxx4
;;
--cxx4)
echo $cxx4
;;
echo $cxx4
;;
--cxx4flags)
echo $cxx4flags
;;
echo $cxx4flags
;;
--cxx4libs)
echo $cxx4libs
;;
echo $cxx4libs
;;
--has-fortran)
echo $has_fortran
;;
--fc)
echo $fc
;;
echo $fc
;;
--fflags)
echo $fflags
;;
echo $fflags
;;
--flibs)
echo $flibs
;;
echo $flibs
;;
--has-f90)
echo $has_f90
;;
echo $has_f90
;;
--has-f03)
echo $has_f03
;;
echo $has_f03
;;
*)
echo "unknown option: $1"
usage 1
;;
usage 1
;;
esac
shift
done

View File

@ -24,6 +24,7 @@ has_logging="@HAS_LOGGING@"
has_cdf5="@HAS_CDF5@"
has_szlib="@HAS_SZLIB@"
has_parallel="@HAS_PARALLEL@"
has_parallel4="@HAS_PARALLEL4@"
version="@PACKAGE_NAME@ @PACKAGE_VERSION@"
@ -68,51 +69,53 @@ Usage: nc-config [OPTION]
Available values for OPTION include:
--help display this help message and exit
--all display all options
--cc C compiler
--cflags pre-processor and compiler flags
--has-c++ whether C++ API is installed
--has-c++4 whether netCDF-4 C++ API is installed
--has-fortran whether Fortran API is installed
--has-dap whether OPeNDAP (DAP2) is enabled in this build
--has-dap4 whether DAP4 is enabled in this build
--has-nc2 whether NetCDF-2 API is enabled
--has-nc4 whether NetCDF-4/HDF-5 is enabled in this build
--has-hdf5 whether HDF5 is used in build (always the same as --has-nc4)
--has-hdf4 whether HDF4 was used in build
--has-logging whether logging is enabled with --enable-logging.
--has-pnetcdf whether PnetCDF was used in build
--has-szlib whether szlib is included in build
--has-parallel whether has parallel IO support via HDF5 and/or PnetCDF
--has-cdf5 whether cdf5 support is included in build
--libs library linking information for netcdf
--prefix Install prefixx
--includedir Include directory
--libdir Library directory
--version Library version
--help display this help message and exit
--all display all options
--cc C compiler
--cflags pre-processor and compiler flags
--has-c++ whether C++ API is installed
--has-c++4 whether netCDF-4 C++ API is installed
--has-fortran whether Fortran API is installed
--has-dap2 whether OPeNDAP (DAP2) is enabled in this build
--has-dap4 whether DAP4 is enabled in this build
--has-dap same as --has-dap2 (Deprecated)
--has-nc2 whether NetCDF-2 API is enabled
--has-nc4 whether NetCDF-4/HDF-5 is enabled in this build
--has-hdf5 whether HDF5 is used in build (always the same as --has-nc4)
--has-hdf4 whether HDF4 was used in build
--has-logging whether logging is enabled with --enable-logging.
--has-pnetcdf whether PnetCDF was used in build
--has-szlib whether szlib is included in build
--has-cdf5 whether cdf5 support is included in build
--has-parallel4 whether has parallel IO support via HDF5
--has-parallel whether has parallel IO support via HDF5 or PnetCDF
--libs library linking information for netcdf
--prefix Install prefixx
--includedir Include directory
--libdir Library directory
--version Library version
EOF
if [ -f "$ncxx4conf" ]; then
cat <<EOF
--cxx4 C++ compiler for netCDF-4 C++ library
--cxx4flags flags needed to compile a C++ program
--cxx4libs libraries needed to link a C++ program
--cxx4 C++ compiler for netCDF-4 C++ library
--cxx4flags flags needed to compile a C++ program
--cxx4libs libraries needed to link a C++ program
EOF
elif [ -f "$ncxxconf" ]; then
cat <<EOF
--cxx C++ compiler
--cxxflags flags needed to compile a C++ program
--cxxlibs libraries needed to link a C++ program
--cxx C++ compiler
--cxxflags flags needed to compile a C++ program
--cxxlibs libraries needed to link a C++ program
EOF
fi
if [ -f "$nfconf" ]; then
cat <<EOF
--fc Fortran compiler
--fflags flags needed to compile a Fortran program
--flibs libraries needed to link a Fortran program
--has-f90 whether Fortran 90 API is installed
--has-f03 whether Fortran 03 API is installed (implies F90).
--fc Fortran compiler
--fflags flags needed to compile a Fortran program
--flibs libraries needed to link a Fortran program
--has-f90 whether Fortran 90 API is installed
--has-f03 whether Fortran 03 API is installed (implies F90).
EOF
fi
exit $1
@ -123,51 +126,53 @@ all()
echo
echo "This $version has been built with the following features: "
echo
echo " --cc -> $cc"
echo " --cflags -> $cflags"
echo " --libs -> $libs"
echo " --cc -> $cc"
echo " --cflags -> $cflags"
echo " --libs -> $libs"
echo
echo " --has-c++ -> $has_cxx"
echo " --cxx -> $cxx"
echo " --has-c++ -> $has_cxx"
echo " --cxx -> $cxx"
if [ -f "$ncxxconf" ]; then
echo " --cxxflags -> $cxxflags"
echo " --cxxlibs -> $cxxlibs"
echo " --cxxflags -> $cxxflags"
echo " --cxxlibs -> $cxxlibs"
fi
echo
echo " --has-c++4 -> $has_cxx4"
echo " --cxx4 -> $cxx4"
echo " --has-c++4 -> $has_cxx4"
echo " --cxx4 -> $cxx4"
if [ -f "$ncxx4conf" ]; then
echo " --cxx4flags -> $cxx4flags"
echo " --cxx4libs -> $cxx4libs"
echo " --cxx4flags -> $cxx4flags"
echo " --cxx4libs -> $cxx4libs"
fi
echo
echo " --has-fortran-> $has_fortran"
echo " --has-fortran -> $has_fortran"
if [ -f "$nfconf" ]; then
echo " --fc -> $fc"
echo " --fflags -> $fflags"
echo " --flibs -> $flibs"
echo " --has-f90 -> $has_f90"
echo " --has-f03 -> $has_f03"
echo " --fc -> $fc"
echo " --fflags -> $fflags"
echo " --flibs -> $flibs"
echo " --has-f90 -> $has_f90"
echo " --has-f03 -> $has_f03"
echo
fi
echo " --has-dap -> $has_dap"
echo " --has-dap4 -> $has_dap4"
echo " --has-nc2 -> $has_nc2"
echo " --has-nc4 -> $has_nc4"
echo " --has-hdf5 -> $has_hdf5"
echo " --has-hdf4 -> $has_hdf4"
echo " --has-logging-> $has_logging"
echo " --has-pnetcdf-> $has_pnetcdf"
echo " --has-szlib -> $has_szlib"
echo " --has-parallel -> $has_parallel"
echo " --has-cdf5 -> $has_cdf5"
echo
echo " --prefix -> $prefix"
echo " --includedir-> $includedir"
echo " --libdir -> $libdir"
echo " --version -> $version"
echo " --has-dap -> $has_dap"
echo " --has-dap2 -> $has_dap"
echo " --has-dap4 -> $has_dap4"
echo " --has-nc2 -> $has_nc2"
echo " --has-nc4 -> $has_nc4"
echo " --has-hdf5 -> $has_hdf5"
echo " --has-hdf4 -> $has_hdf4"
echo " --has-logging -> $has_logging"
echo " --has-pnetcdf -> $has_pnetcdf"
echo " --has-szlib -> $has_szlib"
echo " --has-cdf5 -> $has_cdf5"
echo " --has-parallel4 -> $has_parallel4"
echo " --has-parallel -> $has_parallel"
echo
echo " --prefix -> $prefix"
echo " --includedir -> $includedir"
echo " --libdir -> $libdir"
echo " --version -> $version"
echo
}
@ -187,145 +192,153 @@ while test $# -gt 0; do
case "$1" in
--help)
usage 0
;;
usage 0
;;
--all)
all
;;
all
;;
--cc)
echo $cc
;;
echo $cc
;;
--cflags)
echo $cflags
;;
echo $cflags
;;
--has-dap)
echo $has_dap
;;
echo $has_dap
;;
--has-dap2)
echo $has_dap
;;
--has-dap4)
echo $has_dap4
;;
echo $has_dap4
;;
--has-nc2)
echo $has_nc2
;;
echo $has_nc2
;;
--has-nc4)
echo $has_nc4
;;
echo $has_nc4
;;
--has-hdf5)
echo $has_hdf5
;;
echo $has_hdf5
;;
--has-hdf4)
echo $has_hdf4
;;
echo $has_hdf4
;;
--has-logging)
echo $has_logging
;;
--has-pnetcdf)
echo $has_pnetcdf
;;
echo $has_pnetcdf
;;
--has-szlib)
echo $has_szlib
;;
echo $has_szlib
;;
--has-cdf5)
echo $has_cdf5
;;
--has-parallel4)
echo $has_parallel4
;;
--has-parallel)
echo $has_parallel
;;
--libs)
echo $libs
;;
echo $libs
;;
--prefix)
echo "${prefix}"
;;
echo "${prefix}"
;;
--includedir)
echo "${includedir}"
;;
echo "${includedir}"
;;
--libdir)
echo "${libdir}"
;;
echo "${libdir}"
;;
--version)
echo $version
;;
echo $version
;;
--has-c++)
echo $has_cxx
;;
echo $has_cxx
;;
--cxx)
echo $cxx
;;
echo $cxx
;;
--cxxflags)
echo $cxxflags
;;
echo $cxxflags
;;
--cxxlibs)
echo $cxxlibs
;;
echo $cxxlibs
;;
--has-c++4)
echo $has_cxx4
;;
echo $has_cxx4
;;
--cxx4)
echo $cxx4
;;
echo $cxx4
;;
--cxx4flags)
echo $cxx4flags
;;
echo $cxx4flags
;;
--cxx4libs)
echo $cxx4libs
;;
echo $cxx4libs
;;
--has-fortran)
echo $has_fortran
;;
--fc)
echo $fc
;;
echo $fc
;;
--fflags)
echo $fflags
;;
echo $fflags
;;
--flibs)
echo $flibs
;;
echo $flibs
;;
--has-f90)
echo $has_f90
;;
echo $has_f90
;;
--has-f03)
echo $has_f03
;;
echo $has_f03
;;
*)
echo "unknown option: $1"
usage 1
;;
usage 1
;;
esac
shift
done