From: ellson <devnull@localhost>
Date: Fri, 28 Apr 2006 20:33:44 +0000 (+0000)
Subject: Hook up IPSEPCOLA into GNU build process.
X-Git-Tag: LAST_LIBGRAPH~32^2~6651
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8354ab3758b74985a94089379bc30fd6caa409e;p=graphviz

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 53267a038..97adc8fc5 100644
--- 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 9ceba561c..e78b2045d 100644
--- 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 642bdd597..b04e2dffd 100644
--- 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 60f5abf48..6064cc452 100644
--- 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