[cdo] 63/84: Support new hdf5 layout

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository cdo.

commit 990368d1e8f49daf1697df06916394227273f4ce
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Aug 1 06:49:47 2014 +0100

    Support new hdf5 layout
---
 debian/changelog | 7 +++++++
 debian/rules     | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fe5bfaf..66f7718 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cdo (1.6.4+dfsg.1-3) unstable; urgency=low
+
+  [ Gilles Fillipini ]
+  * Support hdf5 1.8.13 new packaging layout.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Fri, 01 Aug 2014 06:49:11 +0100
+
 cdo (1.6.4+dfsg.1-2) unstable; urgency=medium
 
   * Add limits.h; UCHAR_MAX not defined elsewhere on some archs
diff --git a/debian/rules b/debian/rules
index 2080ca2..e4a71fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,6 +57,12 @@ ifeq ($(ARCH), hppa)
   WITH_MAGICS:=
 endif
 
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+  WITH_HDF5:=--with-hdf5=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+else
+  WITH_HDF5:=--with-hdf5=/usr
+endif
+
 override_dh_auto_clean:
 	dh_auto_clean	|| echo "distclean ok"
 	#rm -f cdo.settings src/config.h  libtool libcdi/config.log libcdi/config.status src/stamp-h1 confdefs.h
@@ -79,7 +85,7 @@ override_dh_autoreconf:
 override_dh_auto_configure:
 	ln -sf /usr/include/cfortran.h libcdi/src/cfortran.h 
 	  ./configure --prefix=/usr --libdir=$(LIBDIR) \
-		--enable-cdi-lib --with-zlib=/usr --with-netcdf=/usr  --with-proj=/usr --with-hdf5=/usr \
+		--enable-cdi-lib --with-zlib=/usr --with-netcdf=/usr  --with-proj=/usr $(WITH_HDF5) \
 		--enable-iso-c-interface  \
 		 $(WITH_GRIB) $(WITH_JASPER) $(WITH_MAGICS)  FC=gfortran \
 		LIBS="-Wl,-Bstatic -lpng -ljasper -lm -ljpeg -lz -Wl,-Bdynamic -lcurl" \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git