Corrected an incomplete merge.
@@ -135,32 +135,6 @@ Usage: nc-config [OPTION]
Available values for OPTION include:
-<<<<<<< HEAD
- --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 parallel-netcdf (a.k.a. pnetcdf) was used in build
- --has-szlib whether szlib is included in build
- --has-parallel whether has parallel IO support va hdf5 and/or pnetcdf
- --has-cdf5 whether cdf5 support is included in build
- --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
@@ -184,7 +158,7 @@ Available values for OPTION include:
--includedir Include directory
--libdir Library directory
--version Library version
->>>>>>> 7bec2daa14d53efdf01be1222faceb4efd8e3b95
+
EOF
if [ -f "$ncxx4conf" ]; then
@@ -256,11 +230,8 @@ fi
echo " --has-logging-> $has_logging"
echo " --has-pnetcdf-> $has_pnetcdf"
echo " --has-szlib -> $has_szlib"
-<<<<<<< HEAD
echo " --has-cdf5 -> $has_cdf5"
-=======
echo " --has-parallel-> $has_parallel"
->>>>>>> 7bec2daa14d53efdf01be1222faceb4efd8e3b95
echo
echo " --prefix -> $prefix"
echo " --includedir-> $includedir"
@@ -340,19 +311,15 @@ while test $# -gt 0; do
echo $has_szlib
;;
-<<<<<<< HEAD
--has-cdf5)
echo $has_cdf5
;;
--libs)
-=======
--has-parallel)
echo $has_parallel
;;
- --libs)
->>>>>>> 7bec2daa14d53efdf01be1222faceb4efd8e3b95
echo $libs
;;
