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

[Alastair McKinstry]

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

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

commit 50a2c508fd8489833521e5322deec6cc0be39de5
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jul 13 10:01:26 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 45aef98..3c7b0bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ cdo (1.6.9+dfsg.1-1) UNRELEASED; urgency=medium
   * New upstream release.
     - remove build-fix.patch for str2uuid(), now not needed.
   * Enable libfftw3 support
+  * Enable --with-curl explicitly.
+  * Now link against gribapi on mips as it is available
 
  -- Alastair McKinstry <mckinstry at debian.org>  Wed, 29 Apr 2015 19:19:51 +0100
 
diff --git a/debian/rules b/debian/rules
index ab936ff..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  --with-fftw3 \
+		--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