X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fdriver.c;h=136b4c4f2705cc0a6fbb67f8a9c1281e14d3f2cc;hb=173d1687aea88e0e5e1b1d8615ed68ebefb15d08;hp=203644584f162eade6f30663c26ffaa81625d58d;hpb=d0b91eae59319ab2756d0d43b9cb15eb9cd3c234;p=pspp

diff --git a/src/output/driver.c b/src/output/driver.c
index 203644584f..136b4c4f27 100644
--- a/src/output/driver.c
+++ b/src/output/driver.c
@@ -246,8 +246,10 @@ output_driver_track_current_command (const struct output_item *output_item,
 extern const struct output_driver_factory txt_driver_factory;
 extern const struct output_driver_factory list_driver_factory;
 extern const struct output_driver_factory html_driver_factory;
-extern const struct output_driver_factory odt_driver_factory;
 extern const struct output_driver_factory csv_driver_factory;
+#ifdef ODT_SUPPORT
+extern const struct output_driver_factory odt_driver_factory;
+#endif
 #ifdef HAVE_CAIRO
 extern const struct output_driver_factory pdf_driver_factory;
 extern const struct output_driver_factory ps_driver_factory;
@@ -259,8 +261,10 @@ static const struct output_driver_factory *factories[] =
     &txt_driver_factory,
     &list_driver_factory,
     &html_driver_factory,
-    &odt_driver_factory,
     &csv_driver_factory,
+#ifdef ODT_SUPPORT
+    &odt_driver_factory,
+#endif
 #ifdef HAVE_CAIRO
     &pdf_driver_factory,
     &ps_driver_factory,
@@ -323,8 +327,9 @@ output_driver_create (struct string_map *options)
     device_type = SETTINGS_DEVICE_LISTING;
   else
     {
+      /* TRANSLATORS: Don't translate the words `terminal' or `listing'. */
       error (0, 0, _("%s is not a valid device type (the choices are "
-                     "\"terminal\" and \"listing\")"), device_string);
+                     "`terminal' and `listing')"), device_string);
       device_type = default_device_type (file_name);
     }
 
@@ -336,7 +341,7 @@ output_driver_create (struct string_map *options)
       const char *key;
 
       STRING_MAP_FOR_EACH_KEY (key, node, options)
-        error (0, 0, _("%s: unknown option \"%s\""), file_name, key);
+        error (0, 0, _("%s: unknown option `%s'"), file_name, key);
     }
   string_map_clear (options);