From 67071f2d4b9351f81144d320f0f6d88f33ff3999 Mon Sep 17 00:00:00 2001 From: erg Date: Thu, 28 Jul 2005 20:26:31 +0000 Subject: [PATCH] Fix bug 753 --- cmd/lefty/Makefile.am | 3 +-- cmd/lefty/Makefile.old | 3 +-- cmd/lefty/common.h | 11 +++++++++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/cmd/lefty/Makefile.am b/cmd/lefty/Makefile.am index 9a3697c6f..e3d9a43c7 100644 --- 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 8794faf06..f262d9600 100644 --- 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 a775975d0..08a192516 100644 --- 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 -- 2.40.0