Commit c17364a0 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

configure: move udunits2 include from include/udunits2 to include

parent 1e3ac6cc
......@@ -9,7 +9,7 @@
2012-10-23 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* Fldstat: set weight to 1 if gridsize is Fldstat: set weight to 1 if gridsize is1 1
* Fldstat: set weight to 1 if gridsize is 1
2012-10-19 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
......
CDO NEWS
--------
Version 1.5.8 (?? October 2012):
Version 1.5.8 (30 October 2012):
New features:
* Added support for netCDF4(HDF5) formatted SCRIP grid description files
* added CDO option -L to lock all I/O calls. This option is neccessary if external I/O libraries like
netCDF4 (HDF5) were installed without thread-safe support.
New operators:
* setunit: Set variable unit
* chunit: Change variable unit
......@@ -12,6 +14,7 @@ Version 1.5.8 (?? October 2012):
* Sinfo: changed output format
* Diff: changed output format
Fixed bugs:
* remaplaf: fixed bug in binary_search_int()
* eca_rr1: result has wrong long name attribute
Version 1.5.6.1 (26 July 2012):
......
......@@ -23,26 +23,30 @@
"lib" : "@THREADS_LIBS@",
"include" : "@THREADS_INCLUDE@"
},
"zlib" : {
"zlib" : {
"lib" : "@ZLIB_LIBS@",
},
"szlib" : {
"szlib" : {
"lib" : "@SZLIB_LIBS@",
"include" : "@SZLIB_INCLUDE@"
},
"hdf5" : {
"hdf5" : {
"lib" : "@HDF5_LIBS@",
"include" : "@HDF5_INCLUDE@"
},
"netcdf" : {
"netcdf" : {
"lib" : "@NETCDF_LIBS@",
"include" : "@NETCDF_INCLUDE@"
},
"proj" : {
"lib" : "@PROJ_LDFLAGS@",
"include" : "@PROJ_INCLUDE@"
},
"USER_NAME" : "@USER_NAME@",
"HOST_NAME" : "@HOST_NAME@",
"SYSTEM_TYPE" : "@SYSTEM_TYPE@"
}
"udunits2" : {
"lib" : "@UDUNITS_LDFLAGS@",
"include" : "@UDUNITS_INCLUDE@"
},
"proj" : {
"lib" : "@PROJ_LDFLAGS@",
"include" : "@PROJ_INCLUDE@"
},
"USER_NAME" : "@USER_NAME@",
"HOST_NAME" : "@HOST_NAME@",
"SYSTEM_TYPE" : "@SYSTEM_TYPE@"
}
......@@ -4,7 +4,7 @@
Name: cdo
#BuildRequires:
Version: 1.5.8rc1
Version: 1.5.8
Release: 1
Summary: Climate Data Operators
License: GNU GENERAL PUBLIC LICENSE Version 2, June 1991
......
......@@ -39,8 +39,8 @@ case "${HOSTNAME}" in
--with-netcdf=$HOME/local \
--with-hdf5=$HOME/local \
--with-szlib=$HOME/local \
--with-udunits2=$HOME/local/udunits-2.1.24 \
--with-proj=/opt/local \
--with-udunits2=/opt/local \
--with-magics=/Users/m214003/local/magics-2.14.9 \
--with-libxml2=/usr \
CC=gcc CFLAGS="-g -pipe -D_REENTRANT -Wall -W -Wfloat-equal -pedantic -O3 -fopenmp -I/opt/include" \
......
......@@ -18569,7 +18569,7 @@ fi
UDUNITS_ROOT=$with_udunits2
if test -d "$UDUNITS_ROOT"; then :
LDFLAGS="$LDFLAGS -L$UDUNITS_ROOT/lib"
CPPFLAGS="$CPPFLAGS -I$UDUNITS_ROOT/include/udunits2"
CPPFLAGS="$CPPFLAGS -I$UDUNITS_ROOT/include"
for ac_header in udunits2.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "udunits2.h" "ac_cv_header_udunits2_h" "$ac_includes_default"
......@@ -18644,7 +18644,7 @@ fi
 
UDUNITS_LDFLAGS=" -L$UDUNITS_ROOT/lib -ludunits2"
 
UDUNITS_INCLUDE=" -I$UDUNITS_ROOT/include/udunits2"
UDUNITS_INCLUDE=" -I$UDUNITS_ROOT/include"
 
else
as_fn_error $? "$UDUNITS_ROOT is not a directory! UDUNITS2 suppressed" "$LINENO" 5
......
......@@ -354,14 +354,14 @@ AC_ARG_WITH([udunits2],
[*],[UDUNITS_ROOT=$with_udunits2
AS_IF([test -d "$UDUNITS_ROOT"],
[LDFLAGS="$LDFLAGS -L$UDUNITS_ROOT/lib"
CPPFLAGS="$CPPFLAGS -I$UDUNITS_ROOT/include/udunits2"
CPPFLAGS="$CPPFLAGS -I$UDUNITS_ROOT/include"
AC_CHECK_HEADERS([udunits2.h])
AC_SEARCH_LIBS([ut_parse],
[udunits2],
[AC_DEFINE([HAVE_LIBUDUNITS2],[1],[Define to 1 for UDUNITS2 support])],
[AC_MSG_ERROR([Could not link to udunits2 library!])])
AC_SUBST([UDUNITS_LDFLAGS],[" -L$UDUNITS_ROOT/lib -ludunits2"])
AC_SUBST([UDUNITS_INCLUDE],[" -I$UDUNITS_ROOT/include/udunits2"])],
AC_SUBST([UDUNITS_INCLUDE],[" -I$UDUNITS_ROOT/include"])],
[AC_MSG_ERROR([$UDUNITS_ROOT is not a directory! UDUNITS2 suppressed])])])],
[AC_MSG_CHECKING([for the UDUNITS2 library])
AC_MSG_RESULT([suppressed])])
......
......@@ -26,7 +26,7 @@
#endif
#if defined (HAVE_LIBUDUNITS2)
# include <udunits2/udunits2.h>
# include <udunits2.h>
#endif
#include <errno.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment