From 71a35ffee013e3178cab0feeb15f7d0336244ae2 Mon Sep 17 00:00:00 2001
From: ellson <devnull@localhost>
Date: Thu, 5 May 2005 03:08:31 +0000
Subject: [PATCH] remove all cairo and gd dependencied from gvrender in
 preparation for these as separately compiled plugins (codegens still use gd
 so gd dependency still exists)

---
 cmd/tools/Makefile.am |  4 +---
 configure.ac          | 17 -----------------
 graphviz.spec.in      |  1 -
 lib/gvc/gvconfig.c    | 11 +++++++----
 4 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index 3972daf78..a7d16ae8c 100644
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -110,10 +110,8 @@ gvpack_LDADD = \
 	$(top_builddir)/lib/gvc/libgvc.la \
 	$(top_builddir)/lib/ingraphs/libingraphs.la \
 	$(top_builddir)/lib/graph/libgraph.la \
-	$(top_builddir)/plugin/cairo/libgvplugin_cairo.la \
-        $(top_builddir)/plugin/gd/libgvplugin_gd.la \
         $(top_builddir)/plugin/text/libgvplugin_text.la \
-        $(top_builddir)/plugin/layout/libgvplugin_layout.la @CAIRO_LIBS@
+        $(top_builddir)/plugin/layout/libgvplugin_layout.la
 endif
 
 
diff --git a/configure.ac b/configure.ac
index 47475de2e..07d1b0a10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1200,21 +1200,6 @@ AC_SUBST(JPEG_LIBS)
 
 fi
 
-dnl -----------------------------------
-dnl INCLUDES and LIBS for cairo
-
-if test "x$enable_gvrender" != "xno"; then
-	PKG_CHECK_MODULES(CAIRO, cairo >= 0.1.3,
-		[AC_DEFINE_UNQUOTED(HAVE_CAIRO,1,
-			[Define if you have the cairo library [EXPERIMENTAL]])],
-		[AC_MSG_WARN(Optional cairo library not available [EXPERIMENTAL])])
-else
-	CAIRO_CFLAGS=""
-	CAIRO_LIBS=""
-fi
-AC_SUBST(CAIRO_CFLAGS)
-AC_SUBST(CAIRO_LIBS)
-
 dnl -----------------------------------
 dnl INCLUDES and LIBS for libgen (provides basename function)
 
@@ -1529,8 +1514,6 @@ AC_CONFIG_FILES(Makefile
 	lib/gvc/Makefile
 	lib/gvc/libgvc.pc
 	plugin/Makefile
-	plugin/cairo/Makefile
-	plugin/gd/Makefile
 	plugin/text/Makefile
 	plugin/layout/Makefile
 	cmd/Makefile
diff --git a/graphviz.spec.in b/graphviz.spec.in
index d2f0f0dbe..4e8b78c9b 100644
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -131,7 +131,6 @@ CFLAGS="$RPM_OPT_FLAGS" \
       --datadir=%{_datadir} \
       --mandir=%{_mandir} \
       --with-x \
-      --disable-gvrender \
       --with-mylibgd \
       --disable-dependency-tracking
 # need gd-2.0.29 commonly available in rpms before removing --enable-mylibgd
diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index 06d622347..c531b5940 100644
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -45,7 +45,7 @@ extern void config_codegen_builtins(GVC_t *gvc);
 
     Blank lines are allowed and ignored.
 
-    plugin_library_path {
+    plugin_library_path packagename {
 	plugin_api {
 	    plugin_type plugin_quality
 	    ...
@@ -55,8 +55,8 @@ extern void config_codegen_builtins(GVC_t *gvc);
 
     e.g.
 
-	/usr/lib/graphviz/libgvplugin_cairo.so {renderer {x 0 png 10 ps -10}}
-	/usr/lib/graphviz/libgvplugin_gdgen.so {renderer {png 0 gif 0 jpg 0}}
+	/usr/lib/graphviz/libgvplugin_cairo.so cairo {renderer {x 0 png 10 ps -10}}
+	/usr/lib/graphviz/libgvplugin_gd.so gd {renderer {png 0 gif 0 jpg 0}}
 
     Internally the config is maintained as lists of plugin_types for each plugin_api.
     If multiple plugins of the same type are found then the highest quality wins.
@@ -140,7 +140,10 @@ static void gvconfig_plugin_install_from_config(GVC_t * gvc, char *s)
     separator(&nest, &s);
     while (*s) {
 	path = token(&nest, &s);
-	packagename = token(&nest, &s);
+	if (nest == 0)
+	    packagename = token(&nest, &s);
+        else
+	    packagename = "x";
 	do {
 	    api = token(&nest, &s);
 	    gv_api = gvplugin_api(api);
-- 
2.40.0