make sure that a mix of builtin plugins and dynamically loaded plugins is supported

diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am
index 206f062a5bbdd64935133a85d3eaab2700f5fb85..0d3dc89b1c437ec075ddd2de70f12861679c5d36 100644 (file)
--- a/lib/gvc/Makefile.am
+++ b/lib/gvc/Makefile.am
@@ -22,20 +22,11 @@ libgvc_la_SOURCES = gvrender.c gvlayout.c gvtextlayout.c gvdevice.c \
        gvcontext.c gvjobs.c gvevent.c gvplugin.c gvconfig.c gvusershape.c \
        gvc.c
 
-if DISABLE_LTDL
 libgvc_la_LIBADD = \
        $(top_builddir)/lib/common/libcommon.la \
        $(top_builddir)/lib/graph/libgraph.la \
        $(top_builddir)/lib/pathplan/libpathplan.la \
        $(top_builddir)/plugin/libplugins.la \
-       @GD_LIBS@ @EXPAT_LIBS@ @Z_LIBS@
-else
-libgvc_la_LIBADD = \
-       $(top_builddir)/lib/common/libcommon.la \
-       $(top_builddir)/lib/graph/libgraph.la \
-       $(top_builddir)/lib/pathplan/libpathplan.la \
        @GD_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@
-endif
-
 
 EXTRA_DIST = Makefile.old

diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index 7e09deb72c5a24d4bf6fbb1cd6d290b1f2d56e39..d0f7d08766e69157b1a7fb525f111c44d3225fbe 100644 (file)
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -251,9 +251,7 @@ char * gvconfig_libdir(void)
     return libdir;
 }
 
-#ifdef DISABLE_LTDL
 extern gvplugin_library_t *builtins[];
-#endif
 
 #ifndef DISABLE_LTDL
 static void config_rescan(GVC_t *gvc, char *config_path)
@@ -431,9 +429,8 @@ codegen_info_t *next_codegen(codegen_info_t * p)
  */
 void gvconfig(GVC_t * gvc, boolean rescan)
 {
-#ifdef DISABLE_LTDL
     gvplugin_library_t **libraryp;
-#else
+#ifndef DISABLE_LTDL
     int sz, rc;
     struct stat config_st, libdir_st;
     FILE *f = NULL;
@@ -452,11 +449,10 @@ void gvconfig(GVC_t * gvc, boolean rescan)
                         "cg", NULL, (gvplugin_installed_t *) p);
 #endif
 
-#ifdef DISABLE_LTDL
     for (libraryp = builtins; *libraryp; libraryp++) {
        gvconfig_plugin_install_from_library(gvc, NULL, *libraryp);
     }
-#else
+#ifndef DISABLE_LTDL
     /* see if there are any new plugins */
     libdir = gvconfig_libdir();
     rc = stat(libdir, &libdir_st);