Hook up IPSEPCOLA into GNU build process.

To enable use "./configure --with-ipsepcola"

Changes include minor C++ source changes to work with latest gcc
	csolve_VPSC.cpp  - add "#include <cassert>"
	constraint.h - remove classname prefix in declaration of slack()
	variable.h - remove classname prefix in declaration of position()

diff --git a/lib/neatogen/quad_prog_vpsc.c b/lib/neatogen/quad_prog_vpsc.c
index 53267a0384b9b540c25925f3c9a331e9e68f10c1..97adc8fc510f564f8db7bff4aa987c7362242f9d 100644 (file)
--- a/lib/neatogen/quad_prog_vpsc.c
+++ b/lib/neatogen/quad_prog_vpsc.c
@@ -1,3 +1,4 @@
+/* $Id$ $Revision$ */
 /* vim:set shiftwidth=4 ts=8: */
 
 /**

diff --git a/lib/neatogen/quad_prog_vpsc.h b/lib/neatogen/quad_prog_vpsc.h
index 9ceba561c0f851a23cbc58717d15cdadd1bd466c..e78b2045d4527d1d91fce4a41f65c16c5d3a136b 100644 (file)
--- a/lib/neatogen/quad_prog_vpsc.h
+++ b/lib/neatogen/quad_prog_vpsc.h
@@ -1,3 +1,4 @@
+/* $Id$ $Revision$ */
 /* vim:set shiftwidth=4 ts=8: */
 
 /**

diff --git a/lib/neatogen/smart_ini_x.c b/lib/neatogen/smart_ini_x.c
index 642bdd597aed14bd374c22c7ccd79e3ac9fb072e..b04e2dffd89424d0423110cff9b7b345d24b7b1e 100644 (file)
--- a/lib/neatogen/smart_ini_x.c
+++ b/lib/neatogen/smart_ini_x.c
@@ -1,3 +1,6 @@
+/* $Id$ $Revision$ */
+/* vim:set shiftwidth=4 ts=8: */
+
 /**********************************************************
 *      This software is part of the graphviz package      *
 *                http://www.graphviz.org/                 *

diff --git a/lib/vpsc/Makefile.am b/lib/vpsc/Makefile.am
index 60f5abf486bac10261565e7bff3cb8fc2b0d40d9..6064cc452acd230836c73b2bd820d0bd06d2ae76 100644 (file)
--- a/lib/vpsc/Makefile.am
+++ b/lib/vpsc/Makefile.am
@@ -1,33 +1,28 @@
-INCLUDES = -I$(top_srcdir)/libvpsc
+# $Id$ $Revision$
+## Process this file with automake to produce Makefile.in
 
-lib_LTLIBRARIES = libvpsc.la
+if WITH_IPSEPCOLA
+noinst_LTLIBRARIES = libvpsc.la
+endif
 
-libvpsc_la_SOURCES = block.cpp\
-       blocks.cpp\
-       constraint.cpp\
-       generate-constraints.cpp\
-       pairingheap/PairingHeap.cpp\
-       remove_rectangle_overlap.cpp\
-       solve_VPSC.cpp\
-       csolve_VPSC.cpp\
-       variable.cpp\
-       isnan.h\
-       block.h\
-       blocks.h\
-       constraint.h\
-       generate-constraints.h\
-       pairingheap/PairingHeap.h\
-       pairingheap/dsexceptions.h\
-       remove_rectangle_overlap.h\
-       solve_VPSC.h\
-       csolve_VPSC.h\
-       variable.h
-
-include_HEADERS = solve_VPSC.h \
-       variable.h
-       constraint.h\
-       generate-constraints.h\
-       remove_rectangle_overlap.h\
-       csolve_VPSC.h
-       
+libvpsc_la_SOURCES = block.cpp \
+       blocks.cpp \
+       constraint.cpp \
+       generate-constraints.cpp \
+       pairingheap/PairingHeap.cpp \
+       remove_rectangle_overlap.cpp \
+       solve_VPSC.cpp \
+       csolve_VPSC.cpp \
+       variable.cpp
 
+noinst_HEADERS = solve_VPSC.h \
+       block.h \
+       blocks.h \
+       variable.h \
+       constraint.h \
+       generate-constraints.h \
+       remove_rectangle_overlap.h \
+       solve_VPSC.h \
+       csolve_VPSC.h \
+       pairingheap/PairingHeap.h \
+       pairingheap/dsexceptions.h