remove -DBUILTINS from CFLAGS - not used anymore

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 97c72b59948b219437aee7e88782daf2a71b5bce..4d2f5b8adc8c0d31562d32d7c10bea4e722d45a6 100644 (file)
--- 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 430ba8de00a5fc45b2722cc222bf94325a10f8e2..2ec462e011c49b0ca81aecde98da9da3ae5cbb60 100644 (file)
--- 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 73c81ea517ee2254648d8c2a4e4feda94985cbe8..eb44463e1f978ea4e02da876b625f80613d04689 100644 (file)
--- 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}}