[sagemath] 01/01: Update polybori/brial detection for 0.8.4.3

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository sagemath.

commit 3f5dd32f3ace4fa79db1a566aea1baa38388b65b
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Jul 5 15:54:04 2016 +0200

    Update polybori/brial detection for 0.8.4.3
---
 debian/pruner/configure.ac | 8 +++++++-
 debian/pruner/pruner.py.in | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/pruner/configure.ac b/debian/pruner/configure.ac
index 9181f05..f0c15d9 100644
--- a/debian/pruner/configure.ac
+++ b/debian/pruner/configure.ac
@@ -334,7 +334,13 @@ AC_SUBST(HAS_PKGCONFIG)
 AC_CHECK_HEADERS(planarity/planarity.h, HAS_PLANARITY="True", HAS_PLANARITY="False")
 AC_SUBST(HAS_PLANARITY)
 
-PKG_CHECK_MODULES(polybori, [polybori-0.8 polybori-groebner-0.8], [HAS_POLYBORI="True"], [HAS_POLYBORI="False"])
+# TODO(brial): brial 0.8.4.3+ has lost its pkg-config file. Hopefully this will
+# come back in the future when upstream finish their renaming efforts, and then
+# we can uncomment the below line again.
+#PKG_CHECK_MODULES(polybori, [polybori-0.8 polybori-groebner-0.8], [HAS_POLYBORI="True"], [HAS_POLYBORI="False"])
+AC_LANG_PUSH([C++])
+AC_CHECK_HEADERS([polybori.h polybori/groebner/groebner.h], HAS_POLYBORI="True", HAS_POLYBORI="False")
+AC_LANG_POP([C++])
 AC_SUBST(HAS_POLYBORI)
 
 AC_CHECK_FILE(/usr/share/sagemath/reflexive_polytopes/reflexive_polytopes_2d, HAS_POLYTOPES="True", HAS_POLYTOPES="False")
diff --git a/debian/pruner/pruner.py.in b/debian/pruner/pruner.py.in
index eb76c27..e7daa08 100644
--- a/debian/pruner/pruner.py.in
+++ b/debian/pruner/pruner.py.in
@@ -30,7 +30,7 @@ dico = {
     'atlas': @HAS_ATLAS@,
     'backports_ssl_match_hostname': @HAS_BACKPORTS_SSL_MATCH_HOSTNAME@,
     'boost_cropped': @HAS_BOOST@,
-    'brial': @HAS_POLYBORI@, # TODO: we need to package the new version
+    'brial': @HAS_POLYBORI@,
     'bzip2': @HAS_BZIP2@,
     'cddlib': @HAS_CDDLIB@,
     'cephes': @HAS_CEPHES@,

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