[sagemath] 02/05: Let pruner accept either openblas or atlas.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository sagemath.

commit d92c028169ad197e55e5fa6a14337a8f2b211496
Author: Tobias Hansen <thansen at debian.org>
Date:   Sun Sep 10 11:40:49 2017 +0100

    Let pruner accept either openblas or atlas.
---
 debian/pruner/configure.ac | 7 +++++--
 debian/pruner/pruner.py.in | 3 +--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/pruner/configure.ac b/debian/pruner/configure.ac
index ed09889..fbb4bdd 100644
--- a/debian/pruner/configure.ac
+++ b/debian/pruner/configure.ac
@@ -235,8 +235,11 @@ AC_SUBST(HAS_NCURSES)
 AC_CHECK_HEADERS(NTL/version.h, HAS_NTL="True", HAS_NTL="False")
 AC_SUBST(HAS_NTL)
 
-PKG_CHECK_MODULES(openblas, blas-openblas, [HAS_OPENBLAS='True'], [HAS_OPENBLAS='False'])
-AC_SUBST(HAS_OPENBLAS)
+PKG_CHECK_MODULES(openblas, blas-openblas, [HAS_BLAS='True'], [HAS_BLAS='False'])
+if test "x${HAS_BLAS}" = "xFalse"; then
+  PKG_CHECK_MODULES(atlas, blas-atlas, [HAS_BLAS='True'], [HAS_BLAS='False'])
+fi
+AC_SUBST(HAS_BLAS)
 
 AC_CHECK_PROG(HAS_PALP, nef-5d.x, "True", "False")
 AC_SUBST(HAS_PALP)
diff --git a/debian/pruner/pruner.py.in b/debian/pruner/pruner.py.in
index 6c51ceb..fbbe851 100644
--- a/debian/pruner/pruner.py.in
+++ b/debian/pruner/pruner.py.in
@@ -49,7 +49,6 @@ sage_standard_packages = set(subprocess.check_output([
 dico = {
     'appnope': @HAS_APPNOPE@,
     'arb': @HAS_ARB@,
-    'atlas': @HAS_ATLAS@,
     'backports_ssl_match_hostname': @HAS_BACKPORTS_SSL_MATCH_HOSTNAME@,
     'boost_cropped': @HAS_BOOST@,
     'brial': @HAS_POLYBORI@,
@@ -106,7 +105,7 @@ dico = {
     'nauty': @HAS_NAUTY@,
     'ncurses': @HAS_NCURSES@,
     'ntl': @HAS_NTL@,
-    'openblas': @HAS_OPENBLAS@,
+    'openblas': @HAS_BLAS@,
     'palp': @HAS_PALP@,
     'pari': @HAS_PARI@,
     'pari_galdata': @HAS_PARI_GALDATA@,

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