Get rid of NO_HTML, NO_POSTSCRIPT.

diff --git a/src/output/ChangeLog b/src/output/ChangeLog
index 4a96aeb941a9479876c7386203e97d30fc102f8b..4f2d1810933999cb1362109a0a428b374dfb133c 100644 (file)
--- a/src/output/ChangeLog
+++ b/src/output/ChangeLog
@@ -1,3 +1,14 @@
+Sat Mar  4 13:48:16 2006  Ben Pfaff  <blp@gnu.org>
+
+       We didn't provide a way to define these macros, so obviously
+       there's little demand for them.
+
+       * html.c: Don't test for NO_HTML.
+
+       * postscript.c: Don't test for NO_POSTSCRIPT.
+
+       * output.c: Don't test for either of those.
+
 Thu Mar  2 08:40:33 WST 2006 John Darrington <john@darrington.wattle.id.au>
        
        * Moved files from src directory

diff --git a/src/output/html.c b/src/output/html.c
index 50561df7c4cc33ea289b55ed1def861cd669f694..1cf65839bb3751eb56069fd0b7e39371e0d409df 100644 (file)
--- a/src/output/html.c
+++ b/src/output/html.c
@@ -17,9 +17,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA. */
 
-/* This #if encloses the rest of the file. */
-#if !NO_HTML
-
 #include <config.h>
 #include "chart.h"
 #include "htmlP.h"
@@ -648,6 +645,3 @@ struct outp_class html_class =
   html_finalise_chart
 
 };
-
-#endif /* !NO_HTML */
-

diff --git a/src/output/output.c b/src/output/output.c
index f6c2025367cb9569d75950e4579894b5e02ed27c..8af1a7b8043033209ba867986c794373d0ed8e40 100644 (file)
--- a/src/output/output.c
+++ b/src/output/output.c
@@ -220,23 +220,15 @@ void
 outp_init (void)
 {
   extern struct outp_class ascii_class;
-#if !NO_POSTSCRIPT
   extern struct outp_class postscript_class;
   extern struct outp_class epsf_class;
-#endif
-#if !NO_HTML
   extern struct outp_class html_class;
-#endif
 
   char def[] = "default";
 
-#if !NO_HTML
   add_class (&html_class);
-#endif
-#if !NO_POSTSCRIPT
   add_class (&epsf_class);
   add_class (&postscript_class);
-#endif
   add_class (&ascii_class);
 
   add_name (def, &def[strlen (def)], OUTP_S_INIT_FILE);

diff --git a/src/output/postscript.c b/src/output/postscript.c
index 754559ca42569ee2d434f5c183a3e9507da7c61b..1a2f256b8e9122d3c0763a4925f1b6e15dc70413 100644 (file)
--- a/src/output/postscript.c
+++ b/src/output/postscript.c
@@ -19,9 +19,6 @@
 
 #include <config.h>
 
-/*this #if encloses the remainder of the file. */
-#if !NO_POSTSCRIPT
-
 #include <ctype.h>
 #include "chart.h"
 #include "message.h"
@@ -3045,5 +3042,3 @@ struct outp_class epsf_class =
   ps_chart_finalise
 
 };
-
-#endif /* NO_POSTSCRIPT */