Fix bug 753

diff --git a/cmd/lefty/Makefile.am b/cmd/lefty/Makefile.am
index 9a3697c6fa7d3769a93e7b41476cd59441092a04..e3d9a43c790a4b8f779715a69f4f8e2931f3bf0d 100644 (file)
--- a/cmd/lefty/Makefile.am
+++ b/cmd/lefty/Makefile.am
@@ -24,8 +24,7 @@ SUBDIRS = ws os dot2l examples
 leftydir = $(pkgdatadir)/lefty
 pdfdir = $(pkgdatadir)/doc/pdf
 
-DEFINES=-DLEFTYPATH=\"$(LEFTYLIBDIR)\" -DHAVE_CONFIG_H \
-        -DFEATURE_MINTSIZE -DFEATURE_DOT -DFEATURE_X11
+DEFINES=-DLEFTYPATH=\"$(LEFTYLIBDIR)\" -DHAVE_CONFIG_H
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/cmd/lefty/ws/x11 \

diff --git a/cmd/lefty/Makefile.old b/cmd/lefty/Makefile.old
index 8794faf0671a5d0c048618efe377aea0da373b48..f262d96004939538e3d1dd7276c1993fc07ebd6f 100644 (file)
--- a/cmd/lefty/Makefile.old
+++ b/cmd/lefty/Makefile.old
@@ -27,8 +27,7 @@ WM = ws/x11
 OS = os/unix
 
 LEFTYLIBDIR= $(LIBDIR)/lefty
-DEFINES=-DLEFTYPATH=\"$(LEFTYLIBDIR)\" -DHAVE_CONFIG_H \
-        -DFEATURE_MINTSIZE -DFEATURE_DOT -DFEATURE_X11
+DEFINES=-DLEFTYPATH=\"$(LEFTYLIBDIR)\" -DHAVE_CONFIG_H
 
 INCS = -I. -I$(ROOT) \
        -I$(DOT2L) \

diff --git a/cmd/lefty/common.h b/cmd/lefty/common.h
index a775975d0f0b9df7065550057272fe240bebdc22..08a19251659265692ffea0aefccebf6e38071814 100644 (file)
--- a/cmd/lefty/common.h
+++ b/cmd/lefty/common.h
@@ -24,7 +24,18 @@ extern "C" {
 #define _COMMON_H
 
 /* some config and conversion definitions from graphviz distribution */
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+/* we set some parameters which graphviz assumes.
+ * At some point, we could consider allowing these to be set in configure
+ * See Makefile.old for others.
+ */
+#define FEATURE_MINTSIZE 1 
+#define FEATURE_DOT 1
+#ifndef MSWIN32
+#define FEATURE_X11 1
+#endif
+#endif
 
 #ifdef _PACKAGE_ast
 #include <ast.h>