Blob Blame History Raw
--- configure.ac.orig	2019-03-26 04:41:03.000000000 -0600
+++ configure.ac	2019-04-16 13:07:26.135455254 -0600
@@ -14,9 +14,8 @@ AC_CONFIG_SRCDIR([src/digraphs.c])
 AC_CONFIG_HEADER([src/_pkgconfig.h:cnf/pkgconfig.h.in])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([cnf])
-AC_CONFIG_SUBDIRS([extern/edge-addition-planarity-suite-Version_3.0.0.5])
 
-PLANARITY_SUITE_DIR=extern/edge-addition-planarity-suite-Version_3.0.0.5
+PLANARITY_SUITE_DIR=/usr/include/planarity
 AC_SUBST(PLANARITY_SUITE_DIR)
 
 dnl ##
--- Makefile.am.orig	2019-04-16 13:07:11.940488474 -0600
+++ Makefile.am	2019-04-16 13:07:26.135455254 -0600
@@ -7,9 +7,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = @PLANARITY_SUITE_DIR@
-
-PLANAR_INCLUDE   = -I$(top_srcdir)/@PLANARITY_SUITE_DIR@/
+PLANAR_INCLUDE   = -I@PLANARITY_SUITE_DIR@
 DIGRAPHS_INCLUDE = -I$(top_srcdir)/extern/
 
 BINARCHDIR = bin/$(GAPARCH)
@@ -49,7 +47,7 @@ digraphs_la_CFLAGS   += $(CODE_COVERAGE_
 
 digraphs_la_LDFLAGS  =  $(GAP_LDFLAGS) -module -avoid-version
 
-digraphs_la_LIBADD = @PLANARITY_SUITE_DIR@/libplanarity.la
+digraphs_la_LIBADD = -lplanarity
 
 if SYS_IS_CYGWIN
 digraphs_la_LDFLAGS += -no-undefined -version-info 0:0:0 -Wl,$(GAPROOT)/bin/$(GAPARCH)/gap.dll
@@ -57,7 +55,6 @@ endif
 
 all-local: digraphs.la
 	$(mkdir_p) $(top_srcdir)/$(BINARCHDIR) $(top_srcdir)/bin/lib
-	cp -RL @PLANARITY_SUITE_DIR@/.libs/*  $(top_srcdir)/bin/lib/
 if SYS_IS_CYGWIN
 	cp .libs/digraphs.dll $(GAPINSTALLLIB)/digraphs.so
 	cp bin/lib/cygplanarity-0.dll $(GAPROOT)/.libs
--- src/planar.c.orig	2019-03-26 04:41:03.000000000 -0600
+++ src/planar.c	2019-04-16 13:07:26.136455252 -0600
@@ -20,10 +20,10 @@
 #include "digraphs.h"        // for DigraphNrVertices, DigraphNrEdges, . . .
 
 // edge-addition-planarity-suite headers
-#include "c/graph.h"
-#include "c/graphK23Search.h"
-#include "c/graphK33Search.h"
-#include "c/graphK4Search.h"
+#include <planarity/graph.h>
+#include <planarity/graphK23Search.h>
+#include <planarity/graphK33Search.h>
+#include <planarity/graphK4Search.h>
 
 #if !defined(GAP_KERNEL_MAJOR_VERSION) || GAP_KERNEL_MAJOR_VERSION < 3
 // compatibility with GAP <= 4.9