build: support for EAPS 4

Author: jengelh

Makefile.in

@@ -45,28 +45,32 @@ endif
 
 
 ifdef WITH_INCLUDED_PLANARITY
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphDFSUtils.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphDrawPlanar.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphDrawPlanar_Extensions.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphEmbed.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphExtensions.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphIO.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphIsolator.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphK23Search.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphK23Search_Extensions.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphK33Search.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphK33Search_Extensions.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphK4Search.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphK4Search_Extensions.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphNonplanar.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphOuterplanarObstruction.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphTests.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/graphUtils.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/listcoll.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/planarityRandomGraphs.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/planaritySpecificGraph.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/planarityUtils.c
-  KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/stack.c
+  KEXT_SOURCES += \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/graphDFSUtils.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/graphUtils.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/extensionSystem/graphExtensions.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/homeomorphSearch/graphK23Search.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/homeomorphSearch/graphK23Search_Extensions.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/homeomorphSearch/graphK33Search.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/homeomorphSearch/graphK33Search_Extensions.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/homeomorphSearch/graphK4Search.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/homeomorphSearch/graphK4Search_Extensions.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/io/g6-api-utilities.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/io/g6-read-iterator.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/io/g6-write-iterator.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/io/graphIO.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/io/strbuf.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/io/strOrFile.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/lowLevelUtils/apiutils.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/lowLevelUtils/listcoll.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/lowLevelUtils/stack.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphDrawPlanar.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphDrawPlanar_Extensions.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphEmbed.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphIsolator.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphNonplanar.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphOuterplanarObstruction.c \
+        $(PLANARITY_SUITE_DIR)/c/graphLib/planarityRelated/graphTests.c
 
   KEXT_CFLAGS += -I$(PLANARITY_SUITE_DIR) -include extern/eaps_flags.h
 else

configure.ac

@@ -94,7 +94,7 @@ AS_IF([test "x$enable_compile_warnings" != "xno"],
 
 AX_CHECK_PLANARITY
 if test "x$with_external_planarity" = xno ; then
-  PLANARITY_SUITE_DIR=extern/edge-addition-planarity-suite-Version_3.0.1.0
+  PLANARITY_SUITE_DIR=extern/edge-addition-planarity-suite-Version_4.0.0.0
   AC_SUBST(PLANARITY_SUITE_DIR)
 fi
 

extern/eaps_flags.h

@@ -14,4 +14,7 @@
 #pragma GCC diagnostic ignored "-Wstrict-prototypes"
 #pragma GCC diagnostic ignored "-Wswitch-default"
 #pragma GCC diagnostic ignored "-Wunused-result"
+#pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
+#pragma GCC diagnostic ignored "-Wredundant-decls"
+#pragma GCC diagnostic ignored "-Wnull-dereference"
 #endif