Wrap uses of config.h in gvc with HAVE_CONFIG_H;

update config.h.old and windows config.h to note DISABLE_LTDL;
fix windows and old makefiles to handle new source files.

diff --git a/config.h.old b/config.h.old
index 5f8e226f4ef368b9169f1a1f7aceecdd84a0bcdc..541351975d01e3251756f6c25d2399a4c810c56b 100644 (file)
--- a/config.h.old
+++ b/config.h.old
@@ -114,6 +114,9 @@
 /* Set to 0 if you don't want the old codegens */
 #define ENABLE_CODEGENS 1
 
+/* 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 0
 

diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
index 3d6f1c6591c45f22299ce16962284eae9066b4e5..3f022ee2c452052d35e1b9498714e6217e825240 100644 (file)
--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
@@ -14,6 +14,10 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include       <stdio.h>
 #include       <stdlib.h>
 #include       <string.h>
@@ -24,7 +28,6 @@
 #include       <glob.h>
 #endif
 
-#include        "config.h"
 #include        "types.h"
 #include        "macros.h"
 #include        "gvc.h"

diff --git a/lib/gvc/gvcontext.c b/lib/gvc/gvcontext.c
index 4feedc2be19f482d719fd899f7b047030ef136c5..983293f8cff4e331827c6b13c51a9f2dcd25bd22 100644 (file)
--- a/lib/gvc/gvcontext.c
+++ b/lib/gvc/gvcontext.c
@@ -22,10 +22,13 @@
     Sometime in the future it may become the basis for a thread.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include        <stdio.h>
 #include        <stdlib.h>
 
-#include       "config.h"
 #include       "types.h"
 #include       "macros.h"
 #include       "graph.h"

diff --git a/lib/gvc/gvjobs.c b/lib/gvc/gvjobs.c
index d1141fab6e4f98bdefee8d35ae3ec1a984e9d120..e3f2f3a30bf0f60010d3a9acdd35ce5f2197cf3b 100644 (file)
--- a/lib/gvc/gvjobs.c
+++ b/lib/gvc/gvjobs.c
@@ -14,11 +14,13 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include       <stdio.h>
 #include       <stdlib.h>
 
-#include       "config.h"
 #include       "types.h"
 #include       "gvc.h"
 

diff --git a/lib/gvc/gvplugin.c b/lib/gvc/gvplugin.c
index 9d3d4cf0789c93426eb7ff46fda6a2ff6eac71d2..b34e35431671f4bb52a53f4bd8ffc1b4a6bf660e 100644 (file)
--- a/lib/gvc/gvplugin.c
+++ b/lib/gvc/gvplugin.c
@@ -14,11 +14,14 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include       <stdio.h>
 #include       <stdlib.h>
 #include       <string.h>
 
-#include        "config.h"
 #include        "types.h"
 #include        "macros.h"
 #include        "gvc.h"

diff --git a/windows/config.h b/windows/config.h
index 7c5b7ea00dafb27e0a77b083a01c75fb8480d0a1..57c27e865252bc2266cff1f4a2d023de57cb9abf 100644 (file)
--- a/windows/config.h
+++ b/windows/config.h
@@ -244,6 +244,9 @@ extern "C" {
 /* 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
+
 /* Define if you want the gd renderers (png, gif, etc ) */
 #define GD_RENDER 1