[sagemath] 01/01: Tentatively use system libplanarity, haven't yet tested

[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 c0366189d363bff37862ac27eab3598e5b79b625
Author: Ximin Luo <infinity0 at debian.org>
Date:   Sat Apr 23 17:35:56 2016 +0200

    Tentatively use system libplanarity, haven't yet tested
---
 debian/control             | 1 +
 debian/pruner/configure.ac | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 932b1ea..5c89dac 100644
--- a/debian/control
+++ b/debian/control
@@ -56,6 +56,7 @@ Build-Depends:
  libmpfr-dev,
  libntl-dev,
  libpari-dev (>= 2.4),
+ libplanarity-dev,
  libpng-dev,
  libpolybori-dev (>= 0.8.3-4),
  libpolybori-groebner-dev,
diff --git a/debian/pruner/configure.ac b/debian/pruner/configure.ac
index e76889a..9181f05 100644
--- a/debian/pruner/configure.ac
+++ b/debian/pruner/configure.ac
@@ -328,8 +328,10 @@ AC_SUBST(HAS_PKGCONF)
 HAS_PKGCONFIG="True"
 AC_SUBST(HAS_PKGCONFIG)
 
-# FIXME(planarity): sagemath uses a heavily patched upstream -- work pending
-HAS_PLANARITY="False"
+# TODO(planarity): check that this is OK
+# sagemath only have 1 (relevant to Debian) patch now that adds "extern" to
+# "char Mode" and "char Line" in planarity.h; ouc build might still work though
+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"])

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