1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69
|
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Adapt nc-config to use pkg-config, necessary because
multiple arch. versions of netcdf may be installed
Last-Updated: 2016-01-16
Forwarded: not-needed
Index: netcdf-parallel-4.7.3/nc-config.in
===================================================================
--- netcdf-parallel-4.7.3.orig/nc-config.in
+++ netcdf-parallel-4.7.3/nc-config.in
@@ -9,25 +9,23 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-cc="@CC@"
-cflags="-I${includedir} @CPPFLAGS@"
-libs="-L${libdir} @NC_LIBS@"
-libsprivate="@LIBS@"
+cc=`pkg-config netcdf --variable=ccompile`
+cflags=`pkg-config netcdf --variable=cflags`
+libsprivate=`pkg-config netcdf --libs`
+has_dap=`pkg-config netcdf --variable=has_dap`
+has_dap4=`pkg-config netcdf --variable=has_dap4`
+has_nc2=`pkg-config netcdf --variable=has_nc2`
+has_nc4=`pkg-config netcdf --variable=has_nc4`
+has_hdf4=`pkg-config netcdf --variable=has_hdf4`
+has_hdf5=`pkg-config netcdf --variable=has_hdf5`
+has_pnetcdf=`pkg-config netcdf --variable=has_pnetcdf`
+has_logging=`pkg-config netcdf --variable=has_logging`
+has_cdf5=`pkg-config netcdf --variable=has_cdf5`
+has_szlib=`pkg-config netcdf --variable=has_szlib`
+has_parallel=`pkg-config netcdf --variable=has_parallel`
+version=`pkg-config netcdf --variable version`
-has_dap="@HAS_DAP@"
-has_dap4="@HAS_DAP4@"
-has_nc2="@HAS_NC2@"
-has_nc4="@HAS_NC4@"
-has_hdf4="@HAS_HDF4@"
-has_pnetcdf="@HAS_PNETCDF@"
-has_hdf5="@HAS_HDF5@"
-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@"
HAS_STATIC=""
Index: netcdf-parallel-4.7.3/netcdf.pc.in
===================================================================
--- netcdf-parallel-4.7.3.orig/netcdf.pc.in
+++ netcdf-parallel-4.7.3/netcdf.pc.in
@@ -3,6 +3,13 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
ccompiler=@CC@
+has_dap="@HAS_DAP@"
+has_nc2="@HAS_NC2@"
+has_nc4="@HAS_NC4@"
+has_hdf4="@HAS_HDF4@"
+has_pnetcdf="@HAS_PNETCDF@"
+has_hdf5="@HAS_HDF5@"
+version="@PACKAGE_NAME@ @PACKAGE_VERSION@"
Name: @PACKAGE@
Description: NetCDF Client Library for C
|