Integrate topfish and sfdp into main tree, using GTS for triangulation;

remove duplicated code

diff --git a/cmd/smyrna/viewport.c b/cmd/smyrna/viewport.c
index 977bfca78f5bcefa746d9b1b336a04c6a66968fe..094b888d18682af860261e7982ef98378fcfc8a0 100755 (executable)
--- a/cmd/smyrna/viewport.c
+++ b/cmd/smyrna/viewport.c
@@ -227,15 +227,12 @@ there i go, turn the page
     view->fmg.fisheye_distortion_fac =
        atoi(get_attribute_value
             ("defaultfisheyemagnifierdistort", view, g));
-       view->drawnodes=
-               atoi(get_attribute_value
-                    ("drawnodes", view, g));
-       view->drawedges=
-               atoi(get_attribute_value
-                    ("drawedges", view, g));
-       view->drawlabels=
-               atoi(get_attribute_value
-                    ("drawlabels", view, g));
+    view->drawnodes=
+       atoi(get_attribute_value ("drawnodes", view, g));
+    view->drawedges=
+       atoi(get_attribute_value ("drawedges", view, g));
+    view->drawlabels=
+       atoi(get_attribute_value ("drawlabels", view, g));
 
 
 //FIXME: I don't think an openGL function can be called before it

diff --git a/configure.ac b/configure.ac
index d6530a95a37bfba53b871a8f7c6cdd564a3af85c..95d097cf15111a592b458db591bd1a6c681c2f6d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2545,6 +2545,7 @@ AC_CONFIG_FILES(Makefile
        lib/dotgen/Makefile
        lib/neatogen/Makefile
        lib/fdpgen/Makefile
+       lib/sfdpgen/Makefile
        lib/circogen/Makefile
        lib/twopigen/Makefile
        lib/pack/Makefile