[magics] 17/31: Enable metview support

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository magics.

commit eafc44f60be0a39b054a49b287e1e8bd31f16a7c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Dec 12 16:25:14 2013 +0000

    Enable metview support
---
 debian/changelog | 3 ++-
 debian/rules     | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5535d6d..ae34620 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-magics++ (2.18.15-5) UNRELEASED; urgency=medium
+magics++ (2.18.15-4) unstable; urgency=medium
 
   * Fix hardening rules: disable PIE as it breaks python shlibs.
+  * Add --enable-metview to support MetView.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Thu, 12 Dec 2013 11:57:36 +0000
 
diff --git a/debian/rules b/debian/rules
index 5143fda..23d973c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,10 +48,12 @@ override_dh_auto_configure:
 	# to find libraries _it_ created. And it makes stuff in the install step. bah.
 	# autoreconf -if
 	dh_auto_configure -- \
+		--enable-metview \
 		--enable-static --enable-cairo $(WITH_EMOSLIB) \
 		--enable-python --enable-opengl \
 		LDFLAGS="$(LDFLAGS) -L$(shell pwd)/src/.libs -Wl,--as-needed"  LIBS=" -lX11 -lpng12 -lz" \
 		MAGPLUS_HOME=$(shell pwd)
+
 override_dh_auto_test check:
 	echo "Tests disabled; see README-testfailures.txt for details"
 	# (ulimit -s 8192; export PYTHONPATH=$(shell pwd)/swig ; export MAGPLUS_HOME=$(shell pwd) ; $(MAKE) check )
@@ -64,7 +66,7 @@ override_dh_auto_install:
 	for pyvers in $(shell pyversions -r) ; do \
                 ver=`echo $$pyvers | sed -e 's/python//g' ` ; \
 		dh_auto_configure -- \
-			--enable-static --enable-cairo --enable-opengl $(WITH_EMOSLIB) \
+			--enable-metview --enable-static --enable-cairo --enable-opengl $(WITH_EMOSLIB) \
 			--enable-python PYTHON=$$pyvers PYTHON_VERSION=$$ver \
 			LDFLAGS="$(LDFLAGS) -L$(shell pwd)/src/.libs -Wl,--as-needed" ; \
 		$(MAKE) -C python/Magics clean install PYTHON_INCLUDE_DIR=/usr/include/$$pyvers \

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