Fix for case of: builtins, but no dynamic plugins

diff --git a/Config.mk b/Config.mk
index 80a0b387056f23a0f5cb7be10ce5934c5be5b48c..1db3aa47bcda10332babdb0c780d421ef364d6a2 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -22,6 +22,10 @@ EXPAT_LIB = -lexpat
 EXTLIB_INC=-I/usr/include/freetype2
 EXTLIB_LIB=-ljpeg -lpng -lfontconfig -lfreetype -lz
 
+# library for libtool dynamic loading
+# to enable, uncoment this, and comment out "DISABLE_LTDL" in config.h.old
+#LTDL_LIB=-lltdl
+
 ###################################################
 #  Typically, nothing below should be changed.    #
 ###################################################
@@ -52,3 +56,4 @@ TK_LIBDIR=$(TKDIR)/lib
 TK_INCDIR=$(TKDIR)/include
 
 VERSION=2.5
+VERSION=2.5

diff --git a/cmd/dot/Makefile.old b/cmd/dot/Makefile.old
index a8f0c5186a180a9e904cbaeb285bd4885ba0c554..3f236708f7c19603c923c06928c650a384270189 100644 (file)
--- a/cmd/dot/Makefile.old
+++ b/cmd/dot/Makefile.old
@@ -18,7 +18,7 @@ XLIBS = -L$(LOC_LIB)/pathplan -lpathplan \
         -L$(LOC_LIB)/graph -lgraph \
         -L$(LOC_LIB)/cdt -lcdt \
         -L$(LOC_LIB)/gd -lgd \
-        $(EXTLIB_LIB) $(EXPAT_LIB) -lltdl -lm
+        $(EXTLIB_LIB) $(EXPAT_LIB) $(LTDL_LIB) -lm
 
 PLUGS = -L$(LOC_PLUG) -lgvplugin_dot_layout -lgvplugin_neato_layout -lgvplugin_usershape_gd
 

diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index 9a76bac8677e129f3219536c0a53bc03fbcdf932..649981a294d920d1d2b7a06265d05c4069762554 100644 (file)
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -469,9 +469,11 @@ void gvconfig(GVC_t * gvc, boolean rescan)
                         "cg", NULL, (gvplugin_installed_t *) p);
 #endif
 
-#ifndef DISABLE_LTDL
+    /* builtins don't require LTDL */
     gvconfig_plugin_install_builtins(gvc);
    
+    gvc->config_found = FALSE;
+#ifndef DISABLE_LTDL
     /* see if there are any new plugins */
     libdir = gvconfig_libdir();
     rc = stat(libdir, &libdir_st);