remove ENABLE_GVRENDER configure option.

	it no longer does anything
	use --disable-ltdl to disable plugins

diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index a7d16ae8c464467399239dcf150fb87ef1ebe6fa..27b895452c110f87d12d8f3f9afa3a8226fc0387 100644 (file)
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -97,23 +97,12 @@ gc_LDADD = \
 
 gvpack_SOURCES = gvpack.c plugins.c
 
-if DISABLE_GVRENDER
 gvpack_LDADD = \
        $(top_builddir)/lib/common/libcommon.la \
        $(top_builddir)/lib/gvc/libgvc.la \
        $(top_builddir)/lib/ingraphs/libingraphs.la \
        $(top_builddir)/lib/graph/libgraph.la \
        $(top_builddir)/plugin/layout/libgvplugin_layout.la
-else
-gvpack_LDADD = \
-       $(top_builddir)/lib/common/libcommon.la \
-       $(top_builddir)/lib/gvc/libgvc.la \
-       $(top_builddir)/lib/ingraphs/libingraphs.la \
-       $(top_builddir)/lib/graph/libgraph.la \
-        $(top_builddir)/plugin/text/libgvplugin_text.la \
-        $(top_builddir)/plugin/layout/libgvplugin_layout.la
-endif
-
 
 dijkstra_SOURCES = dijkstra.c
 

diff --git a/config.h.old b/config.h.old
index 73f652f480e26ad705a6bcc1cb2e655aaa6656ab..bf9667ba96decb1662874a9e7a9fc0e05efe45a6 100644 (file)
--- a/config.h.old
+++ b/config.h.old
@@ -117,9 +117,6 @@
 /* Define if you don't want on-demand plugin loading */
 #define DISABLE_LTDL 1
 
-/* Set if you want the new gvrender codegens */
-#define ENABLE_GVRENDER 1
-
 /* Define if you want the gd renderers (png, gif, etc ) */
 #define GD_RENDER 1
 

diff --git a/configure.ac b/configure.ac
index 092c1b97a042e0495e9a33bb6f4b60918c78aaa6..f902c4b3e6eab833e4b5aa36d0863b5646624f7e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -189,16 +189,6 @@ if test "x$enable_codegens" = "xno"; then
 fi
 AM_CONDITIONAL(DISABLE_CODEGENS, [test "x$enable_codegens" = "xno"])
 
-dnl -----------------------------------
-dnl gvrender plugins
-
-AC_ARG_ENABLE(gvrender,
-  [AC_HELP_STRING([--disable-gvrender], [don't build gvrender plugins])])
-if test "x$enable_gvrender" = "xno"; then
-  AC_DEFINE(DISABLE_GVRENDER,1,[Define if you don't want the new gvrender codegens])
-fi
-AM_CONDITIONAL(DISABLE_GVRENDER, [test "x$enable_gvrender" = "xno"])
-
 dnl -----------------------------------
 dnl ElectricFence support for debugging
 

diff --git a/windows/config.h b/windows/config.h
index 57c27e865252bc2266cff1f4a2d023de57cb9abf..32b265842667236cd71dc584b6831e9d393ec2c0 100644 (file)
--- a/windows/config.h
+++ b/windows/config.h
@@ -241,9 +241,6 @@ extern "C" {
 /* Set to 0 if you don't want the old codegens */
 #define ENABLE_CODEGENS 1
 
-/* Set to 1 if you want the new gvrender codegens */
-#define ENABLE_GVRENDER 0
-
 /* Define if you don't want on-demand plugin loading */
 #define DISABLE_LTDL 1