mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-27 07:30:33 +08:00
Update nc-config in support of https://github.com/Unidata/netcdf-c/issues/2274
This commit is contained in:
Ward Fisher
parent
b1fd4b840d
commit
6f55c85260
@ -7,6 +7,8 @@ This file contains a high-level description of this package's evolution. Release
|
||||
|
||||
## 4.9.2 - TBD
|
||||
|
||||
* Update `nc-config` to remove inclusion from automatically-detected `nf-config` and `ncxx-config` files, as the wrong files could be included in the output. This is in support of [GitHub #2274](https://github.com/Unidata/netcdf-c/issues/2274).
|
||||
|
||||
## 4.9.1 - February 2, 2023
|
||||
|
||||
## Known Issues
|
||||
|
||||
@ -139,40 +139,6 @@ fi
|
||||
|
||||
version="@PACKAGE@ @VERSION@"
|
||||
|
||||
|
||||
has_fortran="no"
|
||||
has_f90="no"
|
||||
has_f03="no"
|
||||
|
||||
nfconf=$(which nf-config 2>/dev/null)
|
||||
|
||||
if [ -f "$nfconf" ]; then
|
||||
has_fortran="yes"
|
||||
fc=`nf-config --fc`
|
||||
fflags=`nf-config --fflags`
|
||||
flibs=`nf-config --flibs`
|
||||
has_f90=`nf-config --has-f90`
|
||||
has_f03=`nf-config --has-f03`
|
||||
fi
|
||||
|
||||
has_cxx="no"
|
||||
has_cxx4="no"
|
||||
|
||||
ncxxconf=$(which ncxx-config 2>/dev/null)
|
||||
ncxx4conf=$(which ncxx4-config 2>/dev/null)
|
||||
|
||||
if [ -f "$ncxx4conf" ]; then
|
||||
cxx4=`ncxx4-config --cxx`
|
||||
cxx4flags=`ncxx4-config --cflags`
|
||||
cxx4libs=`ncxx4-config --libs`
|
||||
has_cxx4="yes"
|
||||
elif [ -f "$ncxxconf" ]; then
|
||||
cxx=`ncxx-config --cxx`
|
||||
cxxflags=`ncxx-config --cflags`
|
||||
cxxlibs=`ncxx-config --libs`
|
||||
has_cxx="yes"
|
||||
fi
|
||||
|
||||
usage()
|
||||
{
|
||||
cat <<EOF
|
||||
@ -184,9 +150,7 @@ Available values for OPTION include:
|
||||
--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)
|
||||
@ -216,28 +180,7 @@ Available values for OPTION include:
|
||||
--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
|
||||
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
|
||||
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).
|
||||
EOF
|
||||
fi
|
||||
|
||||
exit $1
|
||||
}
|
||||
|
||||
@ -251,30 +194,7 @@ all()
|
||||
echo " --libs -> $libs"
|
||||
echo " --static -> $libsprivate"
|
||||
echo
|
||||
echo " --has-c++ -> $has_cxx"
|
||||
echo " --cxx -> $cxx"
|
||||
|
||||
if [ -f "$ncxxconf" ]; then
|
||||
echo " --cxxflags -> $cxxflags"
|
||||
echo " --cxxlibs -> $cxxlibs"
|
||||
fi
|
||||
echo
|
||||
echo " --has-c++4 -> $has_cxx4"
|
||||
echo " --cxx4 -> $cxx4"
|
||||
if [ -f "$ncxx4conf" ]; then
|
||||
echo " --cxx4flags -> $cxx4flags"
|
||||
echo " --cxx4libs -> $cxx4libs"
|
||||
fi
|
||||
echo
|
||||
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
|
||||
fi
|
||||
echo
|
||||
echo " --has-dap -> $has_dap2"
|
||||
echo " --has-dap2 -> $has_dap2"
|
||||
|
||||
143
nc-config.in
143
nc-config.in
@ -41,40 +41,6 @@ has_stdfilters="@STD_FILTERS@"
|
||||
version="@PACKAGE_NAME@ @PACKAGE_VERSION@"
|
||||
HAS_STATIC=""
|
||||
|
||||
|
||||
has_fortran="no"
|
||||
has_f90="no"
|
||||
has_f03="no"
|
||||
|
||||
nfconf=$(which nf-config 2>/dev/null)
|
||||
|
||||
if [ -f "$nfconf" ]; then
|
||||
has_fortran="yes"
|
||||
fc=`nf-config --fc`
|
||||
fflags=`nf-config --fflags`
|
||||
flibs=`nf-config --flibs`
|
||||
has_f90=`nf-config --has-f90`
|
||||
has_f03=`nf-config --has-f03`
|
||||
fi
|
||||
|
||||
has_cxx="no"
|
||||
has_cxx4="no"
|
||||
|
||||
ncxxconf=$(which ncxx-config 2>/dev/null)
|
||||
ncxx4conf=$(which ncxx4-config 2>/dev/null)
|
||||
|
||||
if [ -f "$ncxx4conf" ]; then
|
||||
cxx4=`ncxx4-config --cxx`
|
||||
cxx4flags=`ncxx4-config --cflags`
|
||||
cxx4libs=`ncxx4-config --libs`
|
||||
has_cxx4="yes"
|
||||
elif [ -f "$ncxxconf" ]; then
|
||||
cxx=`ncxx-config --cxx`
|
||||
cxxflags=`ncxx-config --cflags`
|
||||
cxxlibs=`ncxx-config --libs`
|
||||
has_cxx="yes"
|
||||
fi
|
||||
|
||||
usage()
|
||||
{
|
||||
cat <<EOF
|
||||
@ -86,9 +52,7 @@ Available values for OPTION include:
|
||||
--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)
|
||||
@ -118,28 +82,7 @@ Available values for OPTION include:
|
||||
--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
|
||||
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
|
||||
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).
|
||||
EOF
|
||||
fi
|
||||
|
||||
exit $1
|
||||
}
|
||||
|
||||
@ -152,32 +95,6 @@ all()
|
||||
echo " --cflags -> $cflags"
|
||||
echo " --libs -> $libs"
|
||||
echo " --static -> $libsprivate"
|
||||
echo
|
||||
echo " --has-c++ -> $has_cxx"
|
||||
echo " --cxx -> $cxx"
|
||||
|
||||
if [ -f "$ncxxconf" ]; then
|
||||
echo " --cxxflags -> $cxxflags"
|
||||
echo " --cxxlibs -> $cxxlibs"
|
||||
fi
|
||||
echo
|
||||
echo " --has-c++4 -> $has_cxx4"
|
||||
echo " --cxx4 -> $cxx4"
|
||||
if [ -f "$ncxx4conf" ]; then
|
||||
echo " --cxx4flags -> $cxx4flags"
|
||||
echo " --cxx4libs -> $cxx4libs"
|
||||
fi
|
||||
echo
|
||||
|
||||
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
|
||||
fi
|
||||
echo " --has-dap -> $has_dap"
|
||||
echo " --has-dap2 -> $has_dap"
|
||||
echo " --has-dap4 -> $has_dap4"
|
||||
@ -355,62 +272,6 @@ while test $# -gt 0; do
|
||||
echo $version
|
||||
;;
|
||||
|
||||
--has-c++)
|
||||
echo $has_cxx
|
||||
;;
|
||||
|
||||
--cxx)
|
||||
echo $cxx
|
||||
;;
|
||||
|
||||
--cxxflags)
|
||||
echo $cxxflags
|
||||
;;
|
||||
|
||||
--cxxlibs)
|
||||
echo $cxxlibs
|
||||
;;
|
||||
|
||||
--has-c++4)
|
||||
echo $has_cxx4
|
||||
;;
|
||||
|
||||
--cxx4)
|
||||
echo $cxx4
|
||||
;;
|
||||
|
||||
--cxx4flags)
|
||||
echo $cxx4flags
|
||||
;;
|
||||
|
||||
--cxx4libs)
|
||||
echo $cxx4libs
|
||||
;;
|
||||
|
||||
--has-fortran)
|
||||
echo $has_fortran
|
||||
;;
|
||||
|
||||
--fc)
|
||||
echo $fc
|
||||
;;
|
||||
|
||||
--fflags)
|
||||
echo $fflags
|
||||
;;
|
||||
|
||||
--flibs)
|
||||
echo $flibs
|
||||
;;
|
||||
|
||||
--has-f90)
|
||||
echo $has_f90
|
||||
;;
|
||||
|
||||
--has-f03)
|
||||
echo $has_f03
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "unknown option: $1"
|
||||
usage 1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user