Remove WITH_CGRAPH use

diff --git a/dot.demo/demo.c b/dot.demo/demo.c
index 60369b67c055a12102d10f5477e3aa5207ebd113..29b873a392b7308d8a575b342d4ea6981480eb4e 100644 (file)
--- a/dot.demo/demo.c
+++ b/dot.demo/demo.c
@@ -34,17 +34,10 @@ int main(int argc, char **argv)
     gvParseArgs(gvc, argc, argv);
 
     /* Create a simple digraph */
-#ifdef WITH_CGRAPH
     g = agopen("g", Agdirected, 0);
     n = agnode(g, "n", 1);
     m = agnode(g, "m", 1);
     e = agedge(g, n, m, 0, 1);
-#else
-    g = agopen("g", AGDIGRAPH);
-    n = agnode(g, "n");
-    m = agnode(g, "m");
-    e = agedge(g, n, m);
-#endif
 
     /* Set an attribute - in this case one that affects the visible rendering */
     agsafeset(n, "color", "red", "");

diff --git a/dot.demo/example.c b/dot.demo/example.c
index bd07299ca5af41fca209f7685dc8cebabf0d70f0..7dee30b322aa2733cc78b19726c8adb3e205df52 100644 (file)
--- a/dot.demo/example.c
+++ b/dot.demo/example.c
@@ -8,11 +8,7 @@ int main(int argc, char **argv)
     Agnode_t *n, *m;
     Agedge_t *e;
 
-#ifdef NO_LAYOUT_OR_RENDERING
-#ifndef WITH_CGRAPH
-    aginit();
-#endif
-#else
+#ifndef NO_LAYOUT_OR_RENDERING
     /* set up a graphviz context - but only once even for multiple graphs */
     static GVC_t *gvc;
 
@@ -21,17 +17,10 @@ int main(int argc, char **argv)
 #endif
 
     /* Create a simple digraph */
-#ifdef WITH_CGRAPH
-    g = agopen("g", Agdirected, 0);
-    n = agnode(g, "n", 1);
-    m = agnode(g, "m", 1);
-    e = agedge(g, n, m, 0, 1);
-#else
     g = agopen("g", AGDIGRAPH);
     n = agnode(g, "n");
     m = agnode(g, "m");
     e = agedge(g, n, m);
-#endif
 
     /* Set an attribute - in this case one that affects the visible rendering */
     agsafeset(n, "color", "red", "");

diff --git a/dot.demo/neatopack.c b/dot.demo/neatopack.c
index e844885573abf43c8fe52a87f66cfddc39a2ced3..932e03ff5fa8616616525d07dfcba8c7c98c6cdc 100644 (file)
--- a/dot.demo/neatopack.c
+++ b/dot.demo/neatopack.c
@@ -28,11 +28,7 @@ int main (int argc, char* argv[])
         fp = fopen(argv[1], "r");
     else
         fp = stdin;
-#ifdef WITH_CGRAPH
     g = agread(fp, 0);
-#else
-    g = agread(fp);
-#endif
 
     cc = ccomps(g, &ncc, (char*)0);
 

diff --git a/dot.demo/simple.c b/dot.demo/simple.c
index 1517c6ef9d4b9df50b3e7afdc3b1762656de59ff..a8f8efab947f9a4fc4f044349dcbdaf96f9bb948 100644 (file)
--- a/dot.demo/simple.c
+++ b/dot.demo/simple.c
@@ -25,11 +25,7 @@ int main(int argc, char **argv)
        fp = fopen(argv[1], "r");
     else
        fp = stdin;
-#ifdef WITH_CGRAPH
     g = agread(fp, 0);
-#else
-    g = agread(fp);
-#endif
 
     gvLayout(gvc, g, "dot");