From: ellson <devnull@localhost>
Date: Thu, 10 Nov 2005 03:43:04 +0000 (+0000)
Subject: remove -DBUILTINS from CFLAGS - not used anymore
X-Git-Tag: LAST_LIBGRAPH~32^2~6973
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3371d76fb2599cbe850a607899aa84422aeb095;p=graphviz

remove -DBUILTINS from CFLAGS - not used anymore
---

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 97c72b599..4d2f5b8ad 100644
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -11,8 +11,7 @@ AM_CPPFLAGS = \
         -I$(top_srcdir)/lib/gvc \
 	-I$(top_srcdir)/lib/pathplan \
 	-I$(top_srcdir)/lib/graph \
-	-I$(top_srcdir)/lib/cdt \
-	-DBUILTINS
+	-I$(top_srcdir)/lib/cdt
 
 if ENABLE_STATIC
 bin_PROGRAMS = dot dot_static
diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index 430ba8de0..2ec462e01 100644
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -10,7 +10,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/neatogen \
 	-I$(top_srcdir)/lib/gvc \
 	-I$(top_srcdir)/lib/common \
-	-I$(top_srcdir)/lib/ingraphs @EXPAT_INCLUDES@ -DBUILTINS
+	-I$(top_srcdir)/lib/ingraphs @EXPAT_INCLUDES@
 
 pdfdir = $(pkgdatadir)/doc/pdf
 
diff --git a/graphviz.spec.in b/graphviz.spec.in
index 73c81ea51..eb44463e1 100644
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -4,8 +4,7 @@
 # Note: graphviz requires gd with gif support (and other fixes), hence use
 # internal one for now.
 
-# select packages according to dist (set in .rpmmacros on each build host)
-
+# Define a default set incase none of the conditionals apply
 %define CSHARP  0
 %define GUILE   0
 %define _IO     0
@@ -18,6 +17,10 @@
 %define RUBY    0
 %define TCL     1
 
+# Select packages according to dist (set in .rpmmacros on each build host)
+
+# These are all single line conditional blocks because older versions
+# of rpm can't handle multiline blocks/
 %{?rh7: %{expand: %%define PERL    1}}
 %{?rh7: %{expand: %%define TCL     1}}