From: Ben Pfaff <blp@gnu.org>
Date: Thu, 9 Jul 2009 04:52:06 +0000 (-0700)
Subject: output: Use macro HAVE_CHARTS instead of NO_CHARTS.
X-Git-Tag: v0.7.3~4
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41df2767aa78e928e50c59f05db2051f687355d4;p=pspp-builds.git

output: Use macro HAVE_CHARTS instead of NO_CHARTS.

Double negatives make my brain hurt, so don't use them.
---

diff --git a/src/output/chart.h b/src/output/chart.h
index 93762dbd..fea64edf 100644
--- a/src/output/chart.h
+++ b/src/output/chart.h
@@ -17,7 +17,7 @@
 #ifndef OUTPUT_CHART_H
 #define OUTPUT_CHART_H 1
 
-#ifndef NO_CHARTS
+#ifdef HAVE_CHARTS
 #include <stdio.h>              /* Required by <plot.h>. */
 #include <plot.h>
 #endif
diff --git a/src/output/charts/automake.mk b/src/output/charts/automake.mk
index 7be5705c..37901171 100644
--- a/src/output/charts/automake.mk
+++ b/src/output/charts/automake.mk
@@ -21,14 +21,12 @@ src_output_charts_libcharts_la_SOURCES = \
 	$(chart_sources)
 
 EXTRA_DIST += src/output/charts/dummy-chart.c
+AM_CPPFLAGS += -DHAVE_CHARTS=1
 else
 src_output_charts_libcharts_la_SOURCES =  \
 	src/output/charts/dummy-chart.c
 
 EXTRA_DIST += $(chart_sources)
-
-AM_CPPFLAGS += -DNO_CHARTS
-
 endif
 
 EXTRA_DIST += src/output/charts/OChangeLog
diff --git a/src/output/charts/dummy-chart.c b/src/output/charts/dummy-chart.c
index b859d0e0..aab8026c 100644
--- a/src/output/charts/dummy-chart.c
+++ b/src/output/charts/dummy-chart.c
@@ -28,7 +28,7 @@
 #include <gsl/gsl_histogram.h>
 #include <libpspp/compiler.h>
 
-#ifndef NO_CHARTS
+#ifdef HAVE_CHARTS
 #error This file should be used only when compiling without charts.
 #endif