[cdo] 03/04: * Now link against gribapi on mips as it is available * Enable libfftw3 support * Enable --with-curl explicitly

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/1.6.6+dfsg.1-2
in repository cdo.

commit a79da6add9ae904bfb33614384757fcd88a0e52a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jul 13 10:11:15 2015 +0100

    * Now link against gribapi on mips as it is available
    * Enable libfftw3 support
    * Enable --with-curl explicitly
---
 debian/changelog | 5 ++++-
 debian/rules     | 7 +------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 255b63a..b320cd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,11 @@ cdo (1.6.6+dfsg.1-2) unstable; urgency=medium
     ppc64el code. 
   * Additional fix ore reproducible build: set hostname, username to 
     constant values. 
+  * Now link against gribapi on mips as it is available
+  * Enable libfftw3 support
+  * Enable --with-curl explicitly
 
- -- Alastair McKinstry <mckinstry at debian.org>  Wed, 08 Jul 2015 20:44:36 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 13 Jul 2015 10:11:01 +0100
 
 cdo (1.6.6+dfsg.1-1) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index ee586d3..7bc1120 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,11 +43,6 @@ ifeq ($(ARCH),powerpc)
 endif
 
 # grib-api not available on these arches; jasper is only needed for grib-api
-ifeq ($(ARCH), mips)
-  WITH_GRIB:=
-  WITH_JASPER:=
-  WITH_MAGICS:=
-endif
 ifeq ($(ARCH), hppa)
   WITH_GRIB:=
   WITH_JASPER:=
@@ -83,7 +78,7 @@ 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) \
-		--enable-iso-c-interface  \
+		--enable-iso-c-interface  --with-fftw3 --with-curl=/usr --with-udunits2=/usr \
 		 $(WITH_GRIB) $(WITH_JASPER) $(WITH_MAGICS)  FC=gfortran \
 		LIBS=" -lpng -ljasper -lm -ljpeg -lz -lcurl" \
 		LDFLAGS="$(LDFLAGS) $(AS_NEEDED)"

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